Restore change unintentionally killed during merge.

diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 37320c3514f458eca08a554e1e88057a39869ca2..0e5ba8861dd7c297230cedd347131c6fcadd4b33 100644 (file)
--- 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