diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-06-20 09:39:08 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-06-20 09:39:08 -0400 |
| commit | c0b23001a89b79f8d0bebe41bfbe64d840b13191 (patch) | |
| tree | e80b08d540672765451f36710e857c18e979ba79 /sysdeps/x86_64/multiarch | |
| parent | 4cedcaea8dc533ed11d92526bfd4e20ea459e3af (diff) | |
| download | glibc-c0b23001a89b79f8d0bebe41bfbe64d840b13191.tar.gz glibc-c0b23001a89b79f8d0bebe41bfbe64d840b13191.tar.xz glibc-c0b23001a89b79f8d0bebe41bfbe64d840b13191.zip | |
Fix fallout from bits/string.h removal.
Remove one more string inline that was defined directly in string.h;
in the absence of the rest of the inlines, it broke the build.
Like other ifunc shims for these functions,
x86_64/multiarch/{mem,st}pcpy.c need to define __NO_STRING_INLINES and
NO_MEMPCPY_STPCPY_REDIRECT.
* string/string.h (__mempcpy_inline): Delete.
* sysdeps/x86_64/multiarch/mempcpy.c
* sysdeps/x86_64/multiarch/stpcpy.c:
Define NO_MEMPCPY_STPCPY_REDIRECT and __NO_STRING_INLINES
before including string.h.
Diffstat (limited to 'sysdeps/x86_64/multiarch')
| -rw-r--r-- | sysdeps/x86_64/multiarch/mempcpy.c | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/stpcpy.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/x86_64/multiarch/mempcpy.c b/sysdeps/x86_64/multiarch/mempcpy.c index f6e9b8acc0..e627b0082c 100644 --- a/sysdeps/x86_64/multiarch/mempcpy.c +++ b/sysdeps/x86_64/multiarch/mempcpy.c @@ -23,6 +23,8 @@ #if defined SHARED && IS_IN (libc) # define mempcpy __redirect_mempcpy # define __mempcpy __redirect___mempcpy +# define NO_MEMPCPY_STPCPY_REDIRECT +# define __NO_STRING_INLINES # include <string.h> # undef mempcpy # undef __mempcpy diff --git a/sysdeps/x86_64/multiarch/stpcpy.c b/sysdeps/x86_64/multiarch/stpcpy.c index 7043584ba8..b66237e29b 100644 --- a/sysdeps/x86_64/multiarch/stpcpy.c +++ b/sysdeps/x86_64/multiarch/stpcpy.c @@ -22,6 +22,8 @@ # define _HAVE_STRING_ARCH_stpcpy 1 # define stpcpy __redirect_stpcpy # define __stpcpy __redirect___stpcpy +# define NO_MEMPCPY_STPCPY_REDIRECT +# define __NO_STRING_INLINES # include <string.h> # undef stpcpy # undef __stpcpy |