make fortify logic checks less angry

the fortify/optimization check does not play well with our default gcc specs

http://sourceware.org/ml/libc-alpha/2012-06/msg00068.html

diff --git a/include/features.h b/include/features.h
index ddb883a48b25fa54f49c1b852ddf61031a683a16..a8bcf62cfb849e5cec2ea7999d6692488c5e612a 100644 (file)
--- a/include/features.h
+++ b/include/features.h
@@ -323,10 +323,11 @@
 # define __USE_REENTRANT       1
 #endif
 
+#if !defined __OPTIMIZE__ || __OPTIMIZE__ <= 0
+# undef _FORTIFY_SOURCE
+#endif
 #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0
-# if !defined __OPTIMIZE__ || __OPTIMIZE__ <= 0
-#  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
-# elif !__GNUC_PREREQ (4, 1)
+# if !__GNUC_PREREQ (4, 1)
 #  warning _FORTIFY_SOURCE requires GCC 4.1 or later
 # elif _FORTIFY_SOURCE > 1
 #  define __USE_FORTIFY_LEVEL 2