From 6442e914d9213a6d4fe9d58e9a33bc407e18a2aa Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Sat, 20 Jun 2015 19:05:51 +0200
Subject: [PATCH] Use MINSIGSTKSZ and SIGSTKSZ from newlib for Cygwin as well

	* libc/include/sys/signal.h: Move altstack macros completely
	outside of rtems block.

	* include/cygwin/signal.h: Remove definitions of MINSIGSTKSZ
	and SIGSTKSZ here.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 newlib/libc/include/sys/signal.h      | 28 +++++++++++++--------------
 winsup/cygwin/include/cygwin/signal.h |  3 ---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index f2087fe62..6283e8908 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -108,20 +108,6 @@ struct sigaction {
 #define sa_sigaction  _signal_handlers._sigaction
 #endif
 
-#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-/*
- * Minimum and default signal stack constants. Allow for target overrides
- * from <sys/features.h>.
- */
-#ifndef	MINSIGSTKSZ
-#define	MINSIGSTKSZ	2048
-#endif
-#ifndef	SIGSTKSZ
-#define	SIGSTKSZ	8192
-#endif
-
-#endif
-
 #elif defined(__CYGWIN__)
 #include <cygwin/signal.h>
 #else
@@ -137,12 +123,26 @@ struct sigaction
 };
 #endif /* defined(__rtems__) */
 
+#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
+/*
+ * Minimum and default signal stack constants. Allow for target overrides
+ * from <sys/features.h>.
+ */
+#ifndef	MINSIGSTKSZ
+#define	MINSIGSTKSZ	2048
+#endif
+#ifndef	SIGSTKSZ
+#define	SIGSTKSZ	8192
+#endif
+
 /*
  * Possible values for ss_flags in stack_t below.
  */
 #define	SS_ONSTACK	0x1
 #define	SS_DISABLE	0x2
 
+#endif
+
 /*
  * Structure used in sigaltstack call.
  */
diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h
index 2db0a8069..edd5681df 100644
--- a/winsup/cygwin/include/cygwin/signal.h
+++ b/winsup/cygwin/include/cygwin/signal.h
@@ -332,9 +332,6 @@ struct sigaction
   int sa_flags;
 };
 
-#define MINSIGSTKSZ     32768
-#define SIGSTKSZ        65536
-
 #define SA_NOCLDSTOP 1   		/* Do not generate SIGCHLD when children
 					   stop */
 #define SA_SIGINFO   2   		/* Invoke the signal catching function