From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 15 Nov 2004 13:15:02 +0000 (+0000)
Subject: Restore change unintentionally killed during merge.
X-Git-Tag: cvs/fedora-glibc-2_3_3-79~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c508c82e7ded8bb87e2784e25be9d9f8871d6b9;p=thirdparty%2Fglibc.git

Restore change unintentionally killed during merge.
---

diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 37320c3514f..0e5ba8861dd 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