Commit 1e39036d authored Mar 30, 2022 by Nathan Chancellor Committed by Masahiro Yamada Apr 02, 2022

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

This reverts commit 6580c5c1.

This patch is buggy, as noted in the patch linked below. The root cause
has been solved by removing '-mno-global-merge' for the entire kernel.

Link: https://lore.kernel.org/r/20220322173547.677760-1-nathan@kernel.org/


Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

parent cf300b83

arch/um/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -75,10 +75,6 @@ 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)