about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-10-18 22:56:48 +0000
committerJakub Jelinek <jakub@redhat.com>2004-10-18 22:56:48 +0000
commit0ad7eada7b6c1b7c6b81c2dc7e1d7ce170e50b97 (patch)
tree1927048fa30ed7a19f8148e8a97ae01e072214b7
parent1670c7cf0d06b82b064ae37f4c47a9b9692935f2 (diff)
downloadglibc-0ad7eada7b6c1b7c6b81c2dc7e1d7ce170e50b97.tar.gz
glibc-0ad7eada7b6c1b7c6b81c2dc7e1d7ce170e50b97.tar.xz
glibc-0ad7eada7b6c1b7c6b81c2dc7e1d7ce170e50b97.zip
* include/features.h (__USE_FORTIFY_LEVEL): Enable even with
	Red Hat gcc4 4.0.0 and above.
-rw-r--r--ChangeLog5
-rw-r--r--include/features.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9978171580..1239e711e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/features.h (__USE_FORTIFY_LEVEL): Enable even with
+	Red Hat gcc4 4.0.0 and above.
+
 2004-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* malloc/arena.c (ptmalloc_init): Don't use brk if dlopened
diff --git a/include/features.h b/include/features.h
index 9940304ccb..7551dcc5cc 100644
--- a/include/features.h
+++ b/include/features.h
@@ -262,7 +262,9 @@
 # define __USE_REENTRANT	1
 #endif
 
-#if _FORTIFY_SOURCE > 0 && __GNUC_PREREQ (4, 1) && __OPTIMIZE__ > 0
+#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \
+    && (__GNUC_PREREQ (4, 1) \
+        || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)))
 # if _FORTIFY_SOURCE == 1
 #  define __USE_FORTIFY_LEVEL 1
 # elif _FORTIFY_SOURCE > 1