about summary refs log tree commit diff
path: root/debug
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-11-15 13:15:02 +0000
committerJakub Jelinek <jakub@redhat.com>2004-11-15 13:15:02 +0000
commit8c508c82e7ded8bb87e2784e25be9d9f8871d6b9 (patch)
treed8151a455614e3da56962a06046f3fda7de07ed3 /debug
parent19e033b5ff6ebdb0e1454d1911d94d7b2a3fd5c3 (diff)
downloadglibc-8c508c82e7ded8bb87e2784e25be9d9f8871d6b9.tar.gz
glibc-8c508c82e7ded8bb87e2784e25be9d9f8871d6b9.tar.xz
glibc-8c508c82e7ded8bb87e2784e25be9d9f8871d6b9.zip
Restore change unintentionally killed during merge.
Diffstat (limited to 'debug')
-rw-r--r--debug/tst-chk1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 37320c3514..0e5ba8861d 100644
--- a/debug/tst-chk1.c
+++ b/debug/tst-chk1.c
@@ -213,7 +213,7 @@ do_test (void)
   if (memcmp (a.buf1, "aabcdabcjj", 10))
     FAIL ();
 
-#if __USE_FORTIFY_LEVEL < 2
+#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)
   /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
      and sufficient GCC support, as the string operations overflow
      from a.buf1 into a.buf2.  */
@@ -312,7 +312,7 @@ do_test (void)
   memset (a.buf1 + 9, 'j', l0 + 2);
   CHK_FAIL_END
 
-#if __USE_FORTIFY_LEVEL >= 2
+#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
 # define O 0
 #else
 # define O 1