Remove remaining _HAVE_STRING_ARCH_* definitions (BZ #18858)

Since the removal of bits/string.h, _HAVE_STRING_ARCH_* are no
longer used.  This patch removes the unused macros from i686
and x86_64 sysdeps folder.

Checked on x86_64-linux-gnu and i686-linux-gnu.

	* sysdeps/i386/i686/multiarch/strncpy.c (_HAVE_STRING_ARCH_strncpy):
	Remove define.
	* sysdeps/x86_64/multiarch/stpcpy.c (_HAVE_STRING_ARCH_stpcpy):
	Likewise.
	* sysdeps/x86_64/multiarch/strcspn.c (_HAVE_STRING_ARCH_strcspn):
	Likewise.
	* sysdeps/x86_64/multiarch/strncat.c (_HAVE_STRING_ARCH_strncat):
	Likewise.
	* sysdeps/x86_64/multiarch/strncpy.c (_HAVE_STRING_ARCH_strncpy):
	Likewise.
	* sysdeps/x86_64/multiarch/strpbrk.c (_HAVE_STRING_ARCH_strpbrk):
	Likewise.
	* sysdeps/x86_64/multiarch/strspn.c (_HAVE_STRING_ARCH_strspn):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index 815c8fd3272c5b774f984fbcc0c2e652b7dd81e3..f570ec0d073b905e0a887bc0b77fad75b162f0fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2017-09-06  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+       * sysdeps/i386/i686/multiarch/strncpy.c (_HAVE_STRING_ARCH_strncpy):
+       Remove define.
+       * sysdeps/x86_64/multiarch/stpcpy.c (_HAVE_STRING_ARCH_stpcpy):
+       Likewise.
+       * sysdeps/x86_64/multiarch/strcspn.c (_HAVE_STRING_ARCH_strcspn):
+       Likewise.
+       * sysdeps/x86_64/multiarch/strncat.c (_HAVE_STRING_ARCH_strncat):
+       Likewise.
+       * sysdeps/x86_64/multiarch/strncpy.c (_HAVE_STRING_ARCH_strncpy):
+       Likewise.
+       * sysdeps/x86_64/multiarch/strpbrk.c (_HAVE_STRING_ARCH_strpbrk):
+       Likewise.
+       * sysdeps/x86_64/multiarch/strspn.c (_HAVE_STRING_ARCH_strspn):
+       Likewise.
+
 2017-09-06  Florian Weimer  <fweimer@redhat.com>
 
        * malloc/dynarray_emplace_enlarge.c

diff --git a/sysdeps/i386/i686/multiarch/strncpy.c b/sysdeps/i386/i686/multiarch/strncpy.c
index 24404f6fa79ca481a55b02ca26dc4ce93d67d4cd..df1e6255695237ac2666cc5d70e7ca4408d6ddca 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strncpy.c
+++ b/sysdeps/i386/i686/multiarch/strncpy.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strncpy 1
 # define strncpy __redirect_strncpy
 # include <string.h>
 # undef strncpy

diff --git a/sysdeps/x86_64/multiarch/stpcpy.c b/sysdeps/x86_64/multiarch/stpcpy.c
index b66237e29b6734582fac4523b597ec401198c752..122cf909417e1df485091eb5ee1fcdc80fda16da 100644 (file)
--- a/sysdeps/x86_64/multiarch/stpcpy.c
+++ b/sysdeps/x86_64/multiarch/stpcpy.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_stpcpy 1
 # define stpcpy __redirect_stpcpy
 # define __stpcpy __redirect___stpcpy
 # define NO_MEMPCPY_STPCPY_REDIRECT

diff --git a/sysdeps/x86_64/multiarch/strcspn.c b/sysdeps/x86_64/multiarch/strcspn.c
index 011f69aa9c99bba803a9faa78d4beda1b3ca931f..6f4704feacd8b6eed76508bda47fbad929477258 100644 (file)
--- a/sysdeps/x86_64/multiarch/strcspn.c
+++ b/sysdeps/x86_64/multiarch/strcspn.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strcspn 1
 # define strcspn __redirect_strcspn
 # include <string.h>
 # undef strcspn

diff --git a/sysdeps/x86_64/multiarch/strncat.c b/sysdeps/x86_64/multiarch/strncat.c
index d359e16f9dfeedde282721bb7242c38615df39e7..6a416536633dbe56578b6f1cef8c6305e2ce80ee 100644 (file)
--- a/sysdeps/x86_64/multiarch/strncat.c
+++ b/sysdeps/x86_64/multiarch/strncat.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strncat 1
 # define strncat __redirect_strncat
 # include <string.h>
 # undef strncat

diff --git a/sysdeps/x86_64/multiarch/strncpy.c b/sysdeps/x86_64/multiarch/strncpy.c
index 7b71cb9ed810d4180510340c3329c39abd53c2a3..361fd5ae3e1b2e8fcdcedec40c4d47073a203f21 100644 (file)
--- a/sysdeps/x86_64/multiarch/strncpy.c
+++ b/sysdeps/x86_64/multiarch/strncpy.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strncpy 1
 # define strncpy __redirect_strncpy
 # include <string.h>
 # undef strncpy

diff --git a/sysdeps/x86_64/multiarch/strpbrk.c b/sysdeps/x86_64/multiarch/strpbrk.c
index 65453df4983c29bf990d55a962943901c1b827e2..b69cd73493a7ec2e27078f67c313f4d31568637e 100644 (file)
--- a/sysdeps/x86_64/multiarch/strpbrk.c
+++ b/sysdeps/x86_64/multiarch/strpbrk.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strpbrk 1
 # define strpbrk __redirect_strpbrk
 # include <string.h>
 # undef strpbrk

diff --git a/sysdeps/x86_64/multiarch/strspn.c b/sysdeps/x86_64/multiarch/strspn.c
index 942e07ae560be5f82d6e4bcca05ba1a302c3a1d0..6065b39b7534ff766f0c57cbdc8fdcded65c1445 100644 (file)
--- a/sysdeps/x86_64/multiarch/strspn.c
+++ b/sysdeps/x86_64/multiarch/strspn.c
@@ -19,7 +19,6 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #if IS_IN (libc)
-# define _HAVE_STRING_ARCH_strspn 1
 # define strspn __redirect_strspn
 # include <string.h>
 # undef strspn