diff options
| author | Nathan Chancellor <[email protected]> | 2022-03-30 16:45:28 -0700 |
|---|---|---|
| committer | Masahiro Yamada <[email protected]> | 2022-04-02 00:05:28 +0900 |
| commit | 1e39036de5fce1b0c61204c546ca04aff6eafc71 (patch) | |
| tree | 9bc89c50f6d7cb09597db608f6d0774dca6d8f90 | |
| parent | cf300b83c793c25c6b485fdaf7a4447d8ea4c655 (diff) | |
Revert "um: clang: Strip out -mno-global-merge from USER_CFLAGS"
This reverts commit 6580c5c18fb3df2b11c5e0452372f815deeff895.
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/[email protected]/
Signed-off-by: Nathan Chancellor <[email protected]>
Reviewed-by: David Gow <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
| -rw-r--r-- | arch/um/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 320b09cd513c..f2fe63bfd819 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) |