From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754255AbdGXXwa (ORCPT ); Mon, 24 Jul 2017 19:52:30 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33715 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750824AbdGXXwX (ORCPT ); Mon, 24 Jul 2017 19:52:23 -0400 From: Matthias Kaehlcke To: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Michael Davidson Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Greg Hackmann , Nick Desaulniers , Kees Cook , Arnd Bergmann , Bernhard.Rosenkranzer@linaro.org, Matthias Kaehlcke Subject: [PATCH RESEND] x86/boot: #undef memcpy etc in string.c Date: Mon, 24 Jul 2017 16:51:55 -0700 Message-Id: <20170724235155.79255-1-mka@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Davidson 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 Acked-by: H. Peter Anvin Signed-off-by: Matthias Kaehlcke --- 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