From: Nathan Chancellor <nathan@kernel.org>
Date: Wed, 30 Mar 2022 23:45:28 +0000 (-0700)
Subject: Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"
X-Git-Tag: baikal/aarch64/sdk6.1~4278^2~1
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=9774322b816bc28a95dc4788f83180de406ec503;p=kernel.git

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

This reverts commit 0589e226636eb8a115a40c94fc67a0c306fe7b4c.

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>
---

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 320b09cd513cf..f2fe63bfd819f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -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)