Skip to content

Commit 18d5e6c

Browse files
calcodionIngo Molnar
authored andcommitted
x86/boot: #undef memcpy() et al in string.c
undef memcpy() and friends in boot/string.c so that the functions defined here will have the correct names, otherwise we end up up trying to redefine __builtin_memcpy() etc. Surprisingly, GCC allows this (and, helpfully, discards the __builtin_ prefix from the function name when compiling it), but clang does not. Adding these #undef's appears to preserve what I assume was the original intent of the code. Signed-off-by: Michael Davidson <[email protected]> Signed-off-by: Matthias Kaehlcke <[email protected]> Acked-by: H. Peter Anvin <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: [email protected] Cc: Greg Hackmann <[email protected]> Cc: Kees Cook <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Nick Desaulniers <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 520eccd commit 18d5e6c

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

arch/x86/boot/string.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
#include "ctype.h"
1717
#include "string.h"
1818

19+
/*
20+
* Undef these macros so that the functions that we provide
21+
* here will have the correct names regardless of how string.h
22+
* may have chosen to #define them.
23+
*/
24+
#undef memcpy
25+
#undef memset
26+
#undef memcmp
27+
1928
int memcmp(const void *s1, const void *s2, size_t len)
2029
{
2130
bool diff;

0 commit comments

Comments
 (0)