From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 4 May 2013 18:12:58 +0000 (-0400)
Subject: make fortify logic checks less angry
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0371345ce892d174f344d0f912419f4a5b3c8954;p=thirdparty%2Fglibc.git

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 21173a28c30..46638cac1c7 100644
--- a/include/features.h
+++ b/include/features.h
@@ -336,10 +336,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