From 65687ac76c1640e4e01920c0d7c20aff374e6b8c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 6 Sep 2017 14:35:23 -0300 Subject: 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. --- ChangeLog | 17 +++++++++++++++++ sysdeps/i386/i686/multiarch/strncpy.c | 1 - sysdeps/x86_64/multiarch/stpcpy.c | 1 - sysdeps/x86_64/multiarch/strcspn.c | 1 - sysdeps/x86_64/multiarch/strncat.c | 1 - sysdeps/x86_64/multiarch/strncpy.c | 1 - sysdeps/x86_64/multiarch/strpbrk.c | 1 - sysdeps/x86_64/multiarch/strspn.c | 1 - 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 815c8fd327..f570ec0d07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2017-09-06 Adhemerval Zanella + + * 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 * malloc/dynarray_emplace_enlarge.c diff --git a/sysdeps/i386/i686/multiarch/strncpy.c b/sysdeps/i386/i686/multiarch/strncpy.c index 24404f6fa7..df1e625569 100644 --- 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 # undef strncpy diff --git a/sysdeps/x86_64/multiarch/stpcpy.c b/sysdeps/x86_64/multiarch/stpcpy.c index b66237e29b..122cf90941 100644 --- 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 011f69aa9c..6f4704feac 100644 --- 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 # undef strcspn diff --git a/sysdeps/x86_64/multiarch/strncat.c b/sysdeps/x86_64/multiarch/strncat.c index d359e16f9d..6a41653663 100644 --- 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 # undef strncat diff --git a/sysdeps/x86_64/multiarch/strncpy.c b/sysdeps/x86_64/multiarch/strncpy.c index 7b71cb9ed8..361fd5ae3e 100644 --- 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 # undef strncpy diff --git a/sysdeps/x86_64/multiarch/strpbrk.c b/sysdeps/x86_64/multiarch/strpbrk.c index 65453df498..b69cd73493 100644 --- 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 # undef strpbrk diff --git a/sysdeps/x86_64/multiarch/strspn.c b/sysdeps/x86_64/multiarch/strspn.c index 942e07ae56..6065b39b75 100644 --- 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 # undef strspn -- cgit v1.2.3-70-g09d2