From: David Gow <davidgow@google.com>
Date: Thu, 3 Mar 2022 09:06:42 +0000 (+0800)
Subject: um: clang: Strip out -mno-global-merge from USER_CFLAGS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6580c5c18fb3df2b11c5e0452372f815deeff895;p=linux.git

um: clang: Strip out -mno-global-merge from USER_CFLAGS

The things built with USER_CFLAGS don't seem to recognise it as a
compiler option, and print a warning:
clang: warning: argument unused during compilation: '-mno-global-merge' [-Wunused-command-line-argument]

Fixes: 744814d2fa ("um: Allow builds with Clang")
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/um/Makefile b/arch/um/Makefile
index f2fe63bfd819f..320b09cd513cf 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -75,6 +75,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
 		-D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \
 		-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__
 
+ifdef CONFIG_CC_IS_CLANG
+USER_CFLAGS := $(patsubst -mno-global-merge,,$(USER_CFLAGS))
+endif
+
 #This will adjust *FLAGS accordingly to the platform.
 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)