Messages in this thread Patch in this message | | | From | Matthias Kaehlcke <> | Subject | [PATCH RESEND] x86/boot: #undef memcpy etc in string.c | Date | Mon, 24 Jul 2017 16:51:55 -0700 |
| |
From: Michael Davidson <md@google.com>
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 <md@google.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Original post: https://lkml.org/lkml/2017/3/16/1035
arch/x86/boot/string.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index 630e3664906b..16f49123d747 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -16,6 +16,15 @@ #include "ctype.h" #include "string.h" +/* + * Undef these macros so that the functions that we provide + * here will have the correct names regardless of how string.h + * may have chosen to #define them. + */ +#undef memcpy +#undef memset +#undef memcmp + int memcmp(const void *s1, const void *s2, size_t len) { bool diff; -- 2.14.0.rc0.284.gd933b75aa4-goog
| |