[GLIBC][PATCH] Remove string/bits/string2.h header

[Wilco Dijkstra <Wilco dot Dijkstra at arm dot com>]

After https://sourceware.org/ml/libc-alpha/2017-06/msg00027.html there is
no longer a need for string2.h, so remove it and all mention of string2.h.
Move the redirects for __bzero and __stpcpy to include/string.h since they
are still required until all internal uses have been renamed.
This fixes several linknamespace/localplt failures when building with -Os.

Passes GLIBC tests, fewer localplt/linknamespace failures with -Os.

ChangeLog:
2016-06-02  Wilco Dijkstra  <wdijkstr@arm.com>

        [BZ #15105]
        [BZ #19463]
	* include/string.h: Add internal redirects for __bzero and __stpcpy.
	* string/Makefile: Remove bits/string2.h
	* string/string.h: Update comment.
	* string/string-inlines.c: Update comment.
	* string/bits/string2.h: Remove file.

--
diff --git a/include/string.h b/include/string.h
index ce71674086d9a3512486f813fe718547776cd3da..9ef8102dd68fc58a8e45de537f6b27cf73768e1f 100644
--- a/include/string.h
+++ b/include/string.h
@@ -162,6 +162,12 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
 extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
 #endif
 
+/* Redirect internal calls to builtins.  */
+#define __bzero(s, n) __builtin_memset (s, '\0', n)
+#ifndef __stpcpy
+# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
+#endif
+
 extern void *__memcpy_chk (void *__restrict __dest,
 			   const void *__restrict __src, size_t __len,
 			   size_t __destlen) __THROW;
diff --git a/string/Makefile b/string/Makefile
index f317d02a8c7f41f7c343944df6fc9a65c83b8098..8d0d6b08733e7d59eca818376c2850abcfad1601 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -24,8 +24,8 @@ include ../Makeconfig
 
 headers	:= string.h strings.h memory.h endian.h bits/endian.h \
 	   argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
-	   bits/string.h bits/string2.h bits/string3.h \
-	   bits/strings_fortified.h bits/uintn-identity.h
+	   bits/string.h bits/string3.h bits/strings_fortified.h \
+	   bits/uintn-identity.h
 
 routines	:= strcat strchr strcmp strcoll strcpy strcspn		\
 		   strverscmp strdup strndup				\
diff --git a/string/bits/string2.h b/string/bits/string2.h
deleted file mode 100644
index 591533658dcef1dbde3d0579c795b72b8ef72f43..0000000000000000000000000000000000000000
--- a/string/bits/string2.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Machine-independant string function optimizations.
-   Copyright (C) 1997-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STRING_H
-# error "Never use <bits/string2.h> directly; include <string.h> instead."
-#endif
-
-#ifndef __NO_STRING_INLINES
-
-/* Unlike the definitions in the header <bits/string.h> the
-   definitions contained here are not optimized down to assembler
-   level.  Those optimizations are not always a good idea since this
-   means the code size increases a lot.  Instead the definitions here
-   optimize some functions in a way which do not dramatically
-   increase the code size and which do not use assembler.  The main
-   trick is to use GCC's `__builtin_constant_p' function.
-
-   Every function XXX which has a defined version in
-   <bits/string.h> must be accompanied by a symbol _HAVE_STRING_ARCH_XXX
-   to make sure we don't get redefinitions.
-
-   We must use here macros instead of inline functions since the
-   trick won't work with the latter.  */
-
-#ifndef __STRING_INLINE
-# ifdef __cplusplus
-#  define __STRING_INLINE inline
-# else
-#  define __STRING_INLINE __extern_inline
-# endif
-#endif
-
-/* Dereferencing a pointer arg to run sizeof on it fails for the void
-   pointer case, so we use this instead.
-   Note that __x is evaluated twice. */
-#define __string2_1bptr_p(__x) \
-  ((size_t)(const void *)((__x) + 1) - (size_t)(const void *)(__x) == 1)
-
-/* Set N bytes of S to 0.  */
-#define __bzero(s, n) __builtin_memset (s, '\0', n)
-
-/* Copy SRC to DEST, returning pointer to final NUL byte.  */
-#ifndef __stpcpy
-# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
-#endif
-
-
-#ifndef _FORCE_INLINES
-# undef __STRING_INLINE
-#endif
-
-#endif /* No string inlines.  */
diff --git a/string/string-inlines.c b/string/string-inlines.c
index 68aa7d072aca32367708e73a891772e332ddb18d..c8eca1e23031a39c05535d9ec8fae41f9c96bbbf 100644
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -15,9 +15,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/*  <bits/string.h> and <bits/string2.h> declare some extern inline
-    functions.  These functions are declared additionally here if
-    inlining is not possible.  */
+/*  <bits/string.h> may declare some extern inline functions.
+    These functions are defined here if inlining is not possible.  */
 
 #undef __USE_STRING_INLINES
 #define __USE_STRING_INLINES
diff --git a/string/string.h b/string/string.h
index 8eed67d77d5555e5d2beb5fed6866d55c010572f..d1a274628fabb4a6bd97bfb094556bdf69872426 100644
--- a/string/string.h
+++ b/string/string.h
@@ -501,19 +501,11 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
 	__USE_STRING_INLINES
      is defined before including this header.
 
-   - machine-independent optimizations which do not increase the
-     code size significantly and which optimize mainly situations
-     where one or more arguments are compile-time constants.
-     These optimizations are used always when the compiler is
-     taught to optimize.
-
    One can inhibit all optimizations by defining __NO_STRING_INLINES.  */
 
 /* Get the machine-dependent optimizations (if any).  */
 #  include <bits/string.h>
 
-/* These are generic optimizations which do not add too much inline code.  */
-#  include <bits/string2.h>
 # endif
 
 # if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function