From e8e24320d23810739c7c90b741fd5ce95e5caf18 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 1 Nov 2000 16:39:15 +0000 Subject: Update. * string/bits/string2.h: Disable strstr optimizations for newer gcc versions. Patch by Joseph S. Myers . --- string/bits/string2.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'string') diff --git a/string/bits/string2.h b/string/bits/string2.h index bf174a4..a85add7 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1006,8 +1006,9 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2, #endif -/* Find the first occurrence of NEEDLE in HAYSTACK. */ -#ifndef _HAVE_STRING_ARCH_strstr +/* Find the first occurrence of NEEDLE in HAYSTACK. Newer gcc versions + do this itself. */ +#if !defined _HAVE_STRING_ARCH_strstr && !__GNUC_PREREQ (2, 97) # define strstr(haystack, needle) \ (__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \ ? (((__const char *) (needle))[0] == '\0' \ -- cgit v1.1