diff options
Diffstat (limited to 'arch/x86/include/asm/string_64.h')
-rw-r--r-- | arch/x86/include/asm/string_64.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h index 4e4194e21a09..75314c3dbe47 100644 --- a/arch/x86/include/asm/string_64.h +++ b/arch/x86/include/asm/string_64.h | |||
@@ -14,21 +14,6 @@ | |||
14 | extern void *memcpy(void *to, const void *from, size_t len); | 14 | extern void *memcpy(void *to, const void *from, size_t len); |
15 | extern void *__memcpy(void *to, const void *from, size_t len); | 15 | extern void *__memcpy(void *to, const void *from, size_t len); |
16 | 16 | ||
17 | #ifndef CONFIG_FORTIFY_SOURCE | ||
18 | #if (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || __GNUC__ < 4 | ||
19 | #define memcpy(dst, src, len) \ | ||
20 | ({ \ | ||
21 | size_t __len = (len); \ | ||
22 | void *__ret; \ | ||
23 | if (__builtin_constant_p(len) && __len >= 64) \ | ||
24 | __ret = __memcpy((dst), (src), __len); \ | ||
25 | else \ | ||
26 | __ret = __builtin_memcpy((dst), (src), __len); \ | ||
27 | __ret; \ | ||
28 | }) | ||
29 | #endif | ||
30 | #endif /* !CONFIG_FORTIFY_SOURCE */ | ||
31 | |||
32 | #define __HAVE_ARCH_MEMSET | 17 | #define __HAVE_ARCH_MEMSET |
33 | void *memset(void *s, int c, size_t n); | 18 | void *memset(void *s, int c, size_t n); |
34 | void *__memset(void *s, int c, size_t n); | 19 | void *__memset(void *s, int c, size_t n); |