x86/asm: Remove dead __GNUC__ conditionals

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / include / asm / string_64.h

diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h
index 533f74c300c254c7008b508e8262c341a13c90e5..aae9bd798bf02e3213a356dd749bbd6adb7e3129 100644 (file)
--- a/arch/x86/include/asm/string_64.h
+++ b/arch/x86/include/asm/string_64.h
@@ -32,21 +32,6 @@ static __always_inline void *__inline_memcpy(void *to, const void *from, size_t
 extern void *memcpy(void *to, const void *from, size_t len);
 extern void *__memcpy(void *to, const void *from, size_t len);
 
-#ifndef CONFIG_FORTIFY_SOURCE
-#if (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || __GNUC__ < 4
-#define memcpy(dst, src, len)                                  \
-({                                                             \
-       size_t __len = (len);                                   \
-       void *__ret;                                            \
-       if (__builtin_constant_p(len) && __len >= 64)           \
-               __ret = __memcpy((dst), (src), __len);          \
-       else                                                    \
-               __ret = __builtin_memcpy((dst), (src), __len);  \
-       __ret;                                                  \
-})
-#endif
-#endif /* !CONFIG_FORTIFY_SOURCE */
-
 #define __HAVE_ARCH_MEMSET
 void *memset(void *s, int c, size_t n);
 void *__memset(void *s, int c, size_t n);