| Message ID | 20220330234528.1426991-3-nathan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove '-mno-global-merge' from KBUILD_CFLAGS | expand |
On Thu, Mar 31, 2022 at 7:46 AM Nathan Chancellor <nathan@kernel.org> wrote: > > 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/20220322173547.677760-1-nathan@kernel.org/ > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- Looks good to me: getting rid of -mno-global-merge entirely is nicer, anyway. Reviewed-by: David Gow <davidgow@google.com> Cheers, -- David
On Wed, Mar 30, 2022 at 04:45:28PM -0700, Nathan Chancellor wrote: > 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/20220322173547.677760-1-nathan@kernel.org/ > Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org>
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)
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/20220322173547.677760-1-nathan@kernel.org/ Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- arch/um/Makefile | 4 ---- 1 file changed, 4 deletions(-)