[src/trunk]: src/sys/arch Make sigcontext13 visible only to _KERNEL. Make si...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f96378dd2222
branches:  trunk
changeset: 990432:f96378dd2222
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Oct 27 01:11:03 2021 +0000

description:
Make sigcontext13 visible only to _KERNEL.  Make sigcontext visible only
to _LIBC and _KERNEL.

diffstat:

 sys/arch/powerpc/include/signal.h |   8 +++++---
 sys/arch/sh3/include/signal.h     |   8 +++++---
 sys/arch/sparc/include/signal.h   |   9 ++++++---
 sys/arch/vax/include/signal.h     |  11 +++++------
 4 files changed, 21 insertions(+), 15 deletions(-)

diffs (156 lines):

diff -r ba354da64470 -r f96378dd2222 sys/arch/powerpc/include/signal.h
--- a/sys/arch/powerpc/include/signal.h Wed Oct 27 01:10:06 2021 +0000
+++ b/sys/arch/powerpc/include/signal.h Wed Oct 27 01:11:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.23 2021/10/26 16:16:35 christos Exp $     */
+/*     $NetBSD: signal.h,v 1.24 2021/10/27 01:11:03 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -43,14 +43,15 @@
 #include <sys/sigtypes.h>
 #include <machine/frame.h>
 
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(_KERNEL)
 struct sigcontext13 {
        int sc_onstack;                 /* saved onstack flag */
        int sc_mask;                    /* saved signal mask (old style) */
        struct utrapframe sc_frame;     /* saved registers */
 };
-#endif /* __LIBC12_SOURCE__ || _KERNEL */
+#endif /* _KERNEL */
 
+#if defined(_LIBC) || defined(_KERNEL)
 /*
  * struct sigcontext introduced in NetBSD 1.4
  */
@@ -61,6 +62,7 @@
        struct utrapframe sc_frame;     /* saved registers */
        sigset_t sc_mask;               /* saved signal mask (new style) */
 };
+#endif /* _LIBC || _KERNEL */
 
 #endif /* _NETBSD_SOURCE */
 #endif /* !_LOCORE */
diff -r ba354da64470 -r f96378dd2222 sys/arch/sh3/include/signal.h
--- a/sys/arch/sh3/include/signal.h     Wed Oct 27 01:10:06 2021 +0000
+++ b/sys/arch/sh3/include/signal.h     Wed Oct 27 01:11:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.15 2021/10/26 16:16:35 christos Exp $     */
+/*     $NetBSD: signal.h,v 1.16 2021/10/27 01:11:34 thorpej Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -47,7 +47,7 @@
  * to the handler to allow it to restore state properly if
  * a non-standard exit is performed.
  */
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(_KERNEL)
 struct sigcontext13 {
        int     sc_spc;
        int     sc_ssr;
@@ -75,8 +75,9 @@
        int     sc_expevt;              /* XXX should be above */
        int     sc_err;
 };
-#endif
+#endif /* _KERNEL */
 
+#if defined(_LIBC) || defined(_KERNEL)
 #define        __HAVE_STRUCT_SIGCONTEXT
 struct sigcontext {
        int     sc_spc;
@@ -106,6 +107,7 @@
 
        sigset_t sc_mask;       /* signal mask to restore (new style) */
 };
+#endif /* _LIBC || _KERNEL */
 
 #endif /* _NETBSD_SOURCE */
 #endif /* !_SH3_SIGNAL_H_ */
diff -r ba354da64470 -r f96378dd2222 sys/arch/sparc/include/signal.h
--- a/sys/arch/sparc/include/signal.h   Wed Oct 27 01:10:06 2021 +0000
+++ b/sys/arch/sparc/include/signal.h   Wed Oct 27 01:11:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.24 2021/10/26 16:16:35 christos Exp $ */
+/*     $NetBSD: signal.h,v 1.25 2021/10/27 01:12:23 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -61,7 +61,7 @@
  *
  * All machines must have an sc_onstack and sc_mask.
  */
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(_KERNEL)
 struct sigcontext13 {
        int     sc_onstack;             /* sigstack state to restore */
        int     sc_mask;                /* signal mask to restore (old style) */
@@ -77,7 +77,9 @@
        long    sc_g1;                  /* %g1 to restore */
        long    sc_o0;                  /* %o0 to restore */
 };
-#endif /* __LIBC12_SOURCE__ || _KERNEL */
+#endif /* _KERNEL */
+
+#if defined(_LIBC) || defined(_KERNEL)
 #define        __HAVE_STRUCT_SIGCONTEXT
 struct sigcontext {
        int             sc_onstack;     /* sigstack state to restore */
@@ -95,6 +97,7 @@
        long            sc_o0;          /* %o0 to restore */
        sigset_t        sc_mask;        /* signal mask to restore (new style) */
 };
+#endif /* _LIBC || _KERNEL */
 
 #else /* _LOCORE */
 /* XXXXX These values don't work for _LP64 */
diff -r ba354da64470 -r f96378dd2222 sys/arch/vax/include/signal.h
--- a/sys/arch/vax/include/signal.h     Wed Oct 27 01:10:06 2021 +0000
+++ b/sys/arch/vax/include/signal.h     Wed Oct 27 01:11:03 2021 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: signal.h,v 1.18 2021/10/26 16:16:35 christos Exp $   */
+/*      $NetBSD: signal.h,v 1.19 2021/10/27 01:13:22 thorpej Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -36,9 +36,6 @@
 #ifndef _VAX_SIGNAL_H_
 #define _VAX_SIGNAL_H_
 
-#define __SIGTRAMP_SIGCONTEXT_VERSION  2
-#define __SIGTRAMP_SIGINFO_VERSION     3
-
 #include <sys/featuretest.h>
 #include <sys/siginfo.h>
 #include <machine/trap.h>
@@ -54,7 +51,7 @@
  * to the handler to allow it to restore state properly if
  * a non-standard exit is performed.
  */
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(_KERNEL)
 struct sigcontext13 {
        int     sc_onstack;             /* sigstack state to restore */
        int     sc_mask;                /* signal mask to restore (old style) */
@@ -64,8 +61,9 @@
        int     sc_pc;                  /* pc to restore */
        int     sc_ps;                  /* psl to restore */
 };
-#endif /* __LIBC12_SOURCE__ || _KERNEL */
+#endif /* _KERNEL */
 
+#if defined(_LIBC) || defined(_KERNEL)
 #define        __HAVE_STRUCT_SIGCONTEXT
 struct sigcontext {
        int     sc_onstack;             /* sigstack state to restore */
@@ -77,6 +75,7 @@
        int     sc_ps;                  /* psl to restore */
        sigset_t sc_mask;               /* signal mask to restore (new style) */
 };
+#endif /* _LIBC || _KERNEL */
 
 #ifdef _KERNEL
 #define sendsig_sigcontext     sendsig_sighelper