summary refs log tree commit diff
path: root/string/string.h
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2016-04-15 12:33:29 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2016-04-15 12:46:05 +0100
commit155bc2a502b8a455952dec4c7ae72b64eb41d8d1 (patch)
treef1763dfdaf5c1bfe4f864bc9d109c0a29e7c2547 /string/string.h
parentdf1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c (diff)
downloadglibc-155bc2a502b8a455952dec4c7ae72b64eb41d8d1.tar.gz
glibc-155bc2a502b8a455952dec4c7ae72b64eb41d8d1.tar.xz
glibc-155bc2a502b8a455952dec4c7ae72b64eb41d8d1.zip
Remove pre GCC3.2 optimizations from string/bits/string2.h.
        * string/string.h: Use __GNUC_PREREQ(3,4) for bits/string2.h.
        * string/bits/string2.h (__STRING2_SMALL_GET16): Remove.
        (__STRING2_SMALL_GET32): Remove.
        (memset): Remove.
        (__memset_1): Remove.
        (__memset_gc): Remove.
        (__mempcpy): Remove.
        (mempcpy): Remove.
        (__mempcpy_args): Remove.
        (strchr): Remove.
        (strcpy): Remove.
        (strcpy_args): Remove.
        (__stpcpy_args): Remove.
        (__strcmp_cc): Remove.
        (__strcmp_gc): Remove.
        (strstr): Remove.
Diffstat (limited to 'string/string.h')
-rw-r--r--string/string.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/string/string.h b/string/string.h
index 1f3e348834..c7f8fde7b8 100644
--- a/string/string.h
+++ b/string/string.h
@@ -602,7 +602,7 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
 #endif
 
 
-#if defined __GNUC__ && __GNUC__ >= 2
+#if __GNUC_PREREQ (3,4)
 # if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
      && !defined __NO_INLINE__ && !defined __cplusplus
 /* When using GNU CC we provide some optimized versions of selected
@@ -640,8 +640,6 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
     && defined __extern_always_inline && __GNUC_PREREQ (3,2)
 # if !defined _FORCE_INLINES && !defined _HAVE_STRING_ARCH_mempcpy
 
-#undef mempcpy
-#undef __mempcpy
 #define mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)
 #define __mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)