diff --git a/string/bits/string2.h b/string/bits/string2.h
index d9acf8029d90b6eeb6db3b76bae4d419756a61e5..3987f616a241e814fe9636a54c321361c3ef78a4 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -53,47 +53,15 @@
Â Â  ((size_t)(const void *)((__x) + 1) - (size_t)(const void *)(__x) == 1)
Â 
Â /* Set N bytes of S to 0.Â  */
-#if !defined _HAVE_STRING_ARCH_memset
-# define __bzero(s, n) __builtin_memset (s, '\0', n)
-#endif
-
+#define __bzero(s, n) __builtin_memset (s, '\0', n)
Â 
Â /* Copy SRC to DEST, returning pointer to final NUL byte.Â  */
-#ifdef __USE_GNU
-# ifndef _HAVE_STRING_ARCH_stpcpy
-#Â  define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
-/* In glibc we use this function frequently but for namespace reasons
-Â Â  we have to use the name `__stpcpy'.Â  */
-#Â  define stpcpy(dest, src) __stpcpy (dest, src)
-# endif
-#endif
-
-
-/* Copy no more than N characters of SRC to DEST.Â  */
-#ifndef _HAVE_STRING_ARCH_strncpy
-# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)
-#endif
-
-
-/* Append no more than N characters from SRC onto DEST.Â  */
-#ifndef _HAVE_STRING_ARCH_strncat
-# ifdef _USE_STRING_ARCH_strchr
-#Â  define strncat(dest, src, n) \
-Â  (__extension__ ({ char *__dest = (dest);Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  __builtin_constant_p (src) && __builtin_constant_p (n)Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? (strlen (src) < ((size_t) (n))Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? strcat (__dest, src)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  : (*((char *) __mempcpy (strchr (__dest, '\0'),Â Â Â Â Â Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  src, n)) = '\0', __dest))Â Â Â Â  \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  : strncat (dest, src, n); }))
-# else
-#Â  define strncat(dest, src, n) __builtin_strncat (dest, src, n)
-# endif
+#ifndef __stpcpy
+# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
Â #endif
Â 
-
Â /* Compare characters of S1 and S2.Â  */
-#ifndef _HAVE_STRING_ARCH_strcmp
+#ifndef strcmp
Â # define strcmp(s1, s2) \
Â Â  __extension__Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â  ({ size_t __s1_len, __s2_len;Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -139,7 +107,7 @@
Â 
Â 
Â /* Compare N characters of S1 and S2.Â  */
-#ifndef _HAVE_STRING_ARCH_strncmp
+#ifndef strncmp
Â # define strncmp(s1, s2, n)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â  (__extension__ (__builtin_constant_p (n)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  && ((__builtin_constant_p (s1)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -150,26 +118,6 @@
Â #endif
Â 
Â 
-/* Return the length of the initial segment of S which
-Â Â  consists entirely of characters not in REJECT.Â  */
-#ifndef _HAVE_STRING_ARCH_strcspn
-# define strcspn(s, reject) __builtin_strcspn (s, reject)
-#endif
-
-
-/* Return the length of the initial segment of S which
-Â Â  consists entirely of characters in ACCEPT.Â  */
-#ifndef _HAVE_STRING_ARCH_strspn
-# define strspn(s, accept) __builtin_strspn (s, accept)
-#endif
-
-
-/* Find the first occurrence in S of any character in ACCEPT.Â  */
-#ifndef _HAVE_STRING_ARCH_strpbrk
-# define strpbrk(s, accept) __builtin_strpbrk (s, accept)
-#endif
-
-
Â #ifndef _FORCE_INLINES
Â # undef __STRING_INLINE
Â #endif
diff --git a/string/string-inlines.c b/string/string-inlines.c
index fa4a1594b2a1558f77a9c0de7263c94b6abee763..68aa7d072aca32367708e73a891772e332ddb18d 100644
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -31,7 +31,6 @@
Â 
Â #undef __NO_INLINE__
Â #include <bits/string.h>
-#include <bits/string2.h>
Â 
Â #include "shlib-compat.h"
Â 
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h
index 1e794f925d76182ddbf9e8d59f85aa4dbc3aee20..f99a72d4cf5a6985c58a913ac61dbe2451328354 100644
--- a/sysdeps/s390/bits/string.h
+++ b/sysdeps/s390/bits/string.h
@@ -37,7 +37,6 @@
Â # endif
Â #endif
Â 
-#define _HAVE_STRING_ARCH_strlen 1
Â #ifndef _FORCE_INLINES
Â #define strlen(str) __strlen_g ((str))
Â 
@@ -60,7 +59,6 @@ __strlen_g (const char *__str)
Â #endif
Â 
Â /* Copy SRC to DEST.Â  */
-#define _HAVE_STRING_ARCH_strcpy 1
Â #ifndef _FORCE_INLINES
Â #define strcpy(dest, src) __strcpy_g ((dest), (src))
Â 
@@ -80,7 +78,6 @@ __strcpy_g (char *__dest, const char *__src)
Â }
Â #endif
Â 
-#define _HAVE_STRING_ARCH_strncpy 1
Â #ifndef _FORCE_INLINES
Â #define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n))
Â 
@@ -124,7 +121,6 @@ __strncpy_g (char *__dest, const char *__src, size_t __n)
Â #endif
Â 
Â /* Append SRC onto DEST.Â  */
-#define _HAVE_STRING_ARCH_strcat 1
Â #ifndef _FORCE_INLINES
Â #define strcat(dest, src) __strcat_g ((dest), (src))
Â 
@@ -156,7 +152,6 @@ __strcat_g (char *__dest, const char *__src)
Â #endif
Â 
Â /* Append no more than N characters from SRC onto DEST.Â  */
-#define _HAVE_STRING_ARCH_strncat 1
Â #ifndef _FORCE_INLINES
Â #define strncat(dest, src, n) __strncat_g ((dest), (src), (n))
Â 
@@ -204,7 +199,6 @@ __strncat_g (char *__dest, const char *__src, size_t __n)
Â #endif
Â 
Â /* Search N bytes of S for C.Â  */
-#define _HAVE_STRING_ARCH_memchr 1
Â #ifndef _FORCE_INLINES
Â __STRING_INLINE void *
Â memchr (const void *__str, int __c, size_t __n)
@@ -227,8 +221,8 @@ memchr (const void *__str, int __c, size_t __n)
Â #endif
Â 
Â /* Compare S1 and S2.Â  */
-#define _HAVE_STRING_ARCH_strcmp 1
Â #ifndef _FORCE_INLINES
+#define strcmp(s1, s2) strcmp ((s1), (s2))
Â __STRING_INLINE int
Â strcmp (const char *__s1, const char *__s2)
Â {
diff --git a/sysdeps/sparc/bits/string.h b/sysdeps/sparc/bits/string.h
index 4fd4e8d1de6afdf0a7e5a8b7fdb47a79894b5e71..63fa5a227f1959cb0ca04a4ce14882e1742c28d3 100644
--- a/sysdeps/sparc/bits/string.h
+++ b/sysdeps/sparc/bits/string.h
@@ -23,9 +23,5 @@
Â /* sparc uses the aligned string inline ABI.Â  */
Â #define _STRING_INLINE_unaligned 0
Â 
-/* sparc32 and sparc64 strchr(x, '\0') perform better than
-Â Â  __rawmemchr(x, '\0').Â  */
-#define _HAVE_STRING_ARCH_strchr 1
-
Â /* Don't inline mempcpy into memcpy as sparc has an optimized mempcpy.Â  */
Â #define _HAVE_STRING_ARCH_mempcpy 1
diff --git a/sysdeps/x86/bits/string.h b/sysdeps/x86/bits/string.h
index 94cba8e76f2bcd4edafe17bde7243bbd0e965533..cdd45282e5e24b16e229047076d8692f96806841 100644
--- a/sysdeps/x86/bits/string.h
+++ b/sysdeps/x86/bits/string.h
@@ -66,7 +66,6 @@
Â 
Â 
Â /* Copy N bytes of SRC to DEST.Â  */
-# define _HAVE_STRING_ARCH_memcpy 1
Â # define memcpy(dest, src, n) \
Â Â  (__extension__ (__builtin_constant_p (n)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __memcpy_c ((dest), (src), (n))Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -155,7 +154,6 @@ __memcpy_g (void *__dest, const void *__src, size_t __n)
Â Â  return __dest;
Â }
Â 
-# define _HAVE_STRING_ARCH_memmove 1
Â # ifndef _FORCE_INLINES
Â /* Copy N bytes of SRC to DEST, guaranteeing
Â Â Â  correct behavior for overlapping strings.Â  */
@@ -194,7 +192,6 @@ __memmove_g (void *__dest, const void *__src, size_t __n)
Â # endif
Â 
Â /* Compare N bytes of S1 and S2.Â  */
-# define _HAVE_STRING_ARCH_memcmp 1
Â # ifndef _FORCE_INLINES
Â #Â  ifndef __PIC__
Â /* gcc has problems to spill registers when using PIC.Â  */
@@ -222,8 +219,6 @@ memcmp (const void *__s1, const void *__s2, size_t __n)
Â # endif
Â 
Â /* Set N bytes of S to C.Â  */
-# define _HAVE_STRING_ARCH_memset 1
-# define _USE_STRING_ARCH_memset 1
Â # define memset(s, c, n) \
Â Â  (__extension__ (__builtin_constant_p (n) && (n) <= 16Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((n) == 1Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -449,7 +444,6 @@ __memset_gcn_by2 (void *__s, int __c, size_t __n)
Â 
Â 
Â /* Search N bytes of S for C.Â  */
-# define _HAVE_STRING_ARCH_memchr 1
Â # ifndef _FORCE_INLINES
Â __STRING_INLINE void *
Â memchr (const void *__s, int __c, size_t __n)
@@ -486,7 +480,6 @@ memchr (const void *__s, int __c, size_t __n)
Â }
Â # endif
Â 
-# define _HAVE_STRING_ARCH_memrchr 1
Â # ifndef _FORCE_INLINES
Â __STRING_INLINE void *__memrchr (const void *__s, int __c, size_t __n);
Â 
@@ -532,7 +525,6 @@ __memrchr (const void *__s, int __c, size_t __n)
Â # endif
Â 
Â /* Return pointer to C in S.Â  */
-# define _HAVE_STRING_ARCH_rawmemchr 1
Â __STRING_INLINE void *__rawmemchr (const void *__s, int __c);
Â 
Â # ifndef _FORCE_INLINES
@@ -561,7 +553,6 @@ rawmemchr (const void *__s, int __c)
Â 
Â 
Â /* Return the length of S.Â  */
-# define _HAVE_STRING_ARCH_strlen 1
Â # define strlen(str) \
Â Â  (__extension__ (__builtin_constant_p (str)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __builtin_strlen (str)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -588,7 +579,6 @@ __strlen_g (const char *__str)
Â 
Â 
Â /* Copy SRC to DEST.Â  */
-# define _HAVE_STRING_ARCH_strcpy 1
Â # define strcpy(dest, src) \
Â Â  (__extension__ (__builtin_constant_p (src)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? (sizeof ((src)[0]) == 1 && strlen (src) + 1 <= 8Â Â Â Â Â Â Â Â Â Â  \
@@ -673,7 +663,6 @@ __strcpy_g (char *__dest, const char *__src)
Â 
Â 
Â # ifdef __USE_GNU
-#Â  define _HAVE_STRING_ARCH_stpcpy 1
Â /* Copy SRC to DEST.Â  */
Â #Â  define __stpcpy(dest, src) \
Â Â  (__extension__ (__builtin_constant_p (src)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -848,7 +837,6 @@ __stpcpy_g (char *__dest, const char *__src)
Â 
Â 
Â /* Copy no more than N characters of SRC to DEST.Â  */
-# define _HAVE_STRING_ARCH_strncpy 1
Â # define strncpy(dest, src, n) \
Â Â  (__extension__ (__builtin_constant_p (src)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((strlen (src) + 1 >= ((size_t) (n))Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -980,7 +968,6 @@ __strncpy_gg (char *__dest, const char *__src, size_t __n)
Â 
Â 
Â /* Append SRC onto DEST.Â  */
-# define _HAVE_STRING_ARCH_strcat 1
Â # define strcat(dest, src) \
Â Â  (__extension__ (__builtin_constant_p (src)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __strcat_c ((dest), (src), strlen (src) + 1)Â Â Â Â Â Â  \
@@ -1051,7 +1038,6 @@ __strcat_g (char *__dest, const char *__src)
Â 
Â 
Â /* Append no more than N characters from SRC onto DEST.Â  */
-# define _HAVE_STRING_ARCH_strncat 1
Â # define strncat(dest, src, n) \
Â Â  (__extension__ ({ char *__dest = (dest);Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  __builtin_constant_p (src) && __builtin_constant_p (n)Â Â Â  \
@@ -1115,7 +1101,6 @@ __strncat_g (char *__dest, const char __src[], size_t __n)
Â 
Â 
Â /* Compare S1 and S2.Â  */
-# define _HAVE_STRING_ARCH_strcmp 1
Â # define strcmp(s1, s2) \
Â Â  (__extension__ (__builtin_constant_p (s1) && __builtin_constant_p (s2)Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  && (sizeof ((s1)[0]) != 1 || strlen (s1) >= 4)Â Â Â Â Â Â  \
@@ -1219,7 +1204,6 @@ __strcmp_gg (const char *__s1, const char *__s2)
Â 
Â 
Â /* Compare N characters of S1 and S2.Â  */
-# define _HAVE_STRING_ARCH_strncmp 1
Â # define strncmp(s1, s2, n) \
Â Â  (__extension__ (__builtin_constant_p (s1) && strlen (s1) < ((size_t) (n))Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? strcmp ((s1), (s2))Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1263,8 +1247,6 @@ __strncmp_g (const char *__s1, const char *__s2, size_t __n)
Â 
Â 
Â /* Find the first occurrence of C in S.Â  */
-# define _HAVE_STRING_ARCH_strchr 1
-# define _USE_STRING_ARCH_strchr 1
Â # define strchr(s, c) \
Â Â  (__extension__ (__builtin_constant_p (c)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((c) == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1323,7 +1305,6 @@ __strchr_g (const char *__s, int __c)
Â 
Â 
Â /* Find the first occurrence of C in S or the final NUL byte.Â  */
-# define _HAVE_STRING_ARCH_strchrnul 1
Â # define __strchrnul(s, c) \
Â Â  (__extension__ (__builtin_constant_p (c)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((c) == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1386,7 +1367,6 @@ __strchrnul_g (const char *__s, int __c)
Â 
Â # if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
Â /* Find the first occurrence of C in S.Â  This is the BSD name.Â  */
-#Â  define _HAVE_STRING_ARCH_index 1
Â #Â  define index(s, c) \
Â Â  (__extension__ (__builtin_constant_p (c)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __strchr_c ((s), ((c) & 0xff) << 8)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1395,7 +1375,6 @@ __strchrnul_g (const char *__s, int __c)
Â 
Â 
Â /* Find the last occurrence of C in S.Â  */
-# define _HAVE_STRING_ARCH_strrchr 1
Â # define strrchr(s, c) \
Â Â  (__extension__ (__builtin_constant_p (c)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __strrchr_c ((s), ((c) & 0xff) << 8)Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1500,7 +1479,6 @@ __strrchr_g (const char *__s, int __c)
Â 
Â # if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
Â /* Find the last occurrence of C in S.Â  This is the BSD name.Â  */
-#Â  define _HAVE_STRING_ARCH_rindex 1
Â #Â  define rindex(s, c) \
Â Â  (__extension__ (__builtin_constant_p (c)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __strrchr_c ((s), ((c) & 0xff) << 8)Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1510,7 +1488,6 @@ __strrchr_g (const char *__s, int __c)
Â 
Â /* Return the length of the initial segment of S which
Â Â Â  consists entirely of characters not in REJECT.Â  */
-# define _HAVE_STRING_ARCH_strcspn 1
Â # define strcspn(s, reject) \
Â Â  (__extension__ (__builtin_constant_p (reject) && sizeof ((reject)[0]) == 1Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((reject)[0] == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1631,7 +1608,6 @@ __strcspn_g (const char *__s, const char *__reject)
Â 
Â /* Return the length of the initial segment of S which
Â Â Â  consists entirely of characters in ACCEPT.Â  */
-# define _HAVE_STRING_ARCH_strspn 1
Â # define strspn(s, accept) \
Â Â  (__extension__ (__builtin_constant_p (accept) && sizeof ((accept)[0]) == 1Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((accept)[0] == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1751,7 +1727,6 @@ __strspn_g (const char *__s, const char *__accept)
Â 
Â 
Â /* Find the first occurrence in S of any character in ACCEPT.Â  */
-# define _HAVE_STRING_ARCH_strpbrk 1
Â # define strpbrk(s, accept) \
Â Â  (__extension__ (__builtin_constant_p (accept) && sizeof ((accept)[0]) == 1Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((accept)[0] == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1858,7 +1833,6 @@ __strpbrk_g (const char *__s, const char *__accept)
Â 
Â 
Â /* Find the first occurrence of NEEDLE in HAYSTACK.Â  */
-# define _HAVE_STRING_ARCH_strstr 1
Â # define strstr(haystack, needle) \
Â Â  (__extension__ (__builtin_constant_p (needle) && sizeof ((needle)[0]) == 1Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? ((needle)[0] == '\0'Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
@@ -1970,7 +1944,6 @@ __strstr_g (const char *__haystack, const char *__needle)
Â Â Â  processors gcc generates good code.Â  */
Â # if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
Â #Â  ifdef __i686__
-#Â Â  define _HAVE_STRING_ARCH_ffs 1
Â #Â Â  define ffs(word) (__builtin_constant_p (word)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ? __builtin_ffs (word)Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  : ({ int __cnt, __tmp;Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  \
