aboutsummaryrefslogtreecommitdiffstats
path: root/string
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-06-20 09:39:08 -0400
committerZack Weinberg <zackw@panix.com>2017-06-20 09:39:08 -0400
commitc0b23001a89b79f8d0bebe41bfbe64d840b13191 (patch)
treee80b08d540672765451f36710e857c18e979ba79 /string
parent4cedcaea8dc533ed11d92526bfd4e20ea459e3af (diff)
downloadtermbaud-c0b23001a89b79f8d0bebe41bfbe64d840b13191.tar.gz
termbaud-c0b23001a89b79f8d0bebe41bfbe64d840b13191.tar.xz
termbaud-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 'string')
-rw-r--r--string/string.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/string/string.h b/string/string.h
index 3b68579c2e4..5aec0efe7f9 100644
--- a/string/string.h
+++ b/string/string.h
@@ -494,23 +494,6 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
# endif
#endif
-#if defined __USE_GNU && defined __OPTIMIZE__ \
- && defined __extern_always_inline && __GNUC_PREREQ (3,2)
-# if !defined _FORCE_INLINES && !defined _HAVE_STRING_ARCH_mempcpy
-
-#define mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)
-#define __mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)
-
-__extern_always_inline void *
-__mempcpy_inline (void *__restrict __dest,
- const void *__restrict __src, size_t __n)
-{
- return (char *) memcpy (__dest, __src, __n) + __n;
-}
-
-# endif
-#endif
-
__END_DECLS
#endif /* string.h */