From 78a1b1beb47866d8c70bf7e8efd8007e2f6eacf8 Mon Sep 17 00:00:00 2001
From: stefanf <stefanf@FreeBSD.org>
Date: Sat, 20 Aug 2005 16:44:41 +0000
Subject: Move MINSIGSTKSZ from <machine/signal.h> to <machine/_limits.h> and
 rename it to __MINSIGSTKSZ.  Define MINSIGSTKSZ in <sys/signal.h>.

This is done in order to use MINSIGSTKSZ for the macro PTHREAD_STACK_MIN
in <pthread.h> (soon <limits.h>) without having to include the whole
<sys/signal.h> header.

Discussed with:		bde
---
 sys/alpha/include/_limits.h   | 6 ++++++
 sys/alpha/include/signal.h    | 8 --------
 sys/amd64/include/_limits.h   | 6 ++++++
 sys/amd64/include/signal.h    | 8 --------
 sys/arm/include/_limits.h     | 3 +++
 sys/arm/include/signal.h      | 4 ----
 sys/i386/include/_limits.h    | 6 ++++++
 sys/i386/include/signal.h     | 8 --------
 sys/ia64/include/_limits.h    | 3 +++
 sys/ia64/include/signal.h     | 5 -----
 sys/powerpc/include/_limits.h | 3 +++
 sys/powerpc/include/signal.h  | 4 ----
 sys/sparc64/include/_limits.h | 3 +++
 sys/sparc64/include/signal.h  | 4 ----
 sys/sys/signal.h              | 2 ++
 15 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index 6e9b567..0ab5874 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -87,4 +87,10 @@
 #define	__LONG_BIT	64
 #define	__WORD_BIT	32
 
+/*
+ * Minimum signal stack size. The current signal frame
+ * for Alpha is 808 bytes large.
+ */
+#define	__MINSIGSTKSZ	(1024 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 7e91ed8..06f6a41 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -36,14 +36,6 @@
 
 typedef long	sig_atomic_t;
 
-#if __XSI_VISIBLE
-/*
- * Minimum signal stack size. The current signal frame
- * for Alpha is 808 bytes large.
- */
-#define	MINSIGSTKSZ	(1024 * 4)
-#endif
-
 /*
  * Only the kernel should need these old type definitions.
  */
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index fdea69e..bd0f2ef 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -83,4 +83,10 @@
 #define	__LONG_BIT	64
 #define	__WORD_BIT	32
 
+/*
+ * Minimum signal stack size. The current signal frame
+ * for i386 is 408 bytes large.
+ */
+#define	__MINSIGSTKSZ	(512 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 412a34f..7a4c2a7 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -43,14 +43,6 @@
 
 typedef long sig_atomic_t;
 
-#if __XSI_VISIBLE
-/*
- * Minimum signal stack size. The current signal frame
- * for i386 is 408 bytes large.
- */
-#define	MINSIGSTKSZ	(512 * 4)
-#endif
-
 #if __BSD_VISIBLE
 #include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
 
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 25616e5..0d9e492 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -94,4 +94,7 @@
 #endif
 #define	__WORD_BIT	32
 
+/* Minimum signal stack size. */
+#define	__MINSIGSTKSZ	(1024 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index abc5188..2170082 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -39,10 +39,6 @@
 
 typedef	long sig_atomic_t;
 
-#if __XSI_VISIBLE
-#define	MINSIGSTKSZ	(1024 * 4)
-#endif
-
 #if __BSD_VISIBLE
 
 struct sigcontext {
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index 461f4c3..f328951 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -94,4 +94,10 @@
 #endif
 #define	__WORD_BIT	32
 
+/*
+ * Minimum signal stack size. The current signal frame
+ * for i386 is 408 bytes large.
+ */
+#define	__MINSIGSTKSZ	(512 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index cdeedb2..8d6b935 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -42,14 +42,6 @@
 
 typedef int sig_atomic_t;
 
-#if __XSI_VISIBLE
-/*
- * Minimum signal stack size. The current signal frame
- * for i386 is 408 bytes large.
- */
-#define	MINSIGSTKSZ	(512 * 4)
-#endif
-
 #if __BSD_VISIBLE
 #include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
 
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
index 581a9db..cb26d97 100644
--- a/sys/ia64/include/_limits.h
+++ b/sys/ia64/include/_limits.h
@@ -86,4 +86,7 @@
 #define	__LONG_BIT	64
 #define	__WORD_BIT	32
 
+/* Minimum signal stack size. */
+#define	__MINSIGSTKSZ	(3072 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
index 7665799..d99013c 100644
--- a/sys/ia64/include/signal.h
+++ b/sys/ia64/include/signal.h
@@ -50,11 +50,6 @@ typedef long	sig_atomic_t;
 #define BUS_SEGM_FAULT	30	/* segment protection base */
 #endif
 
-#if __XSI_VISIBLE
-/* Minimum signal stack size. */
-#define MINSIGSTKSZ     (3072 * 4)
-#endif
-
 /*
  * Information pushed on stack when a signal is delivered.
  * This is used by the kernel to restore state following
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 260475d..76e73544 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -93,4 +93,7 @@
 #endif
 #define	__WORD_BIT	32
 
+/* Minimum signal stack size. */
+#define	__MINSIGSTKSZ	(512 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index b1f32e6..ba0bee2 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -37,10 +37,6 @@
 
 #include <sys/cdefs.h>
 
-#if __XSI_VISIBLE
-#define	MINSIGSTKSZ	(512 * 4)
-#endif
-
 typedef int sig_atomic_t;
 
 #if __BSD_VISIBLE
diff --git a/sys/sparc64/include/_limits.h b/sys/sparc64/include/_limits.h
index 04604a2..2483692 100644
--- a/sys/sparc64/include/_limits.h
+++ b/sys/sparc64/include/_limits.h
@@ -81,4 +81,7 @@
 #define	__LONG_BIT	64
 #define	__WORD_BIT	32
 
+/* Minimum signal stack size. */
+#define	__MINSIGSTKSZ	(1024 * 4)
+
 #endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/sparc64/include/signal.h b/sys/sparc64/include/signal.h
index 853814c..d96cef6 100644
--- a/sys/sparc64/include/signal.h
+++ b/sys/sparc64/include/signal.h
@@ -38,10 +38,6 @@
 
 typedef	long sig_atomic_t;
 
-#if __XSI_VISIBLE
-#define	MINSIGSTKSZ	(1024 * 4)
-#endif
-
 #if __BSD_VISIBLE
 struct sigcontext {
 	int	_dummy;
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 425bf33..6016f13 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -42,6 +42,7 @@
 #include <sys/_types.h>
 #include <sys/_sigset.h>
 
+#include <machine/_limits.h>	/* __MINSIGSTKSZ */
 #include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
 
 /*
@@ -274,6 +275,7 @@ typedef	struct {
 
 #define	SS_ONSTACK	0x0001	/* take signal on alternate stack */
 #define	SS_DISABLE	0x0004	/* disable taking signals on alternate stack */
+#define	MINSIGSTKSZ	__MINSIGSTKSZ		/* minimum stack size */
 #define	SIGSTKSZ	(MINSIGSTKSZ + 32768)	/* recommended stack size */
 #endif
 
-- 
cgit v1.1