Update.

* string/bits/string2.h: Disable strstr optimizations for newer gcc versions. Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
git-mirror · Nov 1, 2000 · e8e2432 · e8e2432
1 parent 4442d7e
commit e8e2432
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* string/bits/string2.h: Disable strstr optimizations for newer
+	gcc versions.  Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
+
 	* configure.in (with_cvs): Test for pserver access.
 
 2000-10-31  Ulrich Drepper  <drepper@redhat.com>

diff --git 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'		      \