author: Nick Desaulniers <ndesaulniers@google.com> 2020-10-13 16:47:37 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-10-13 18:38:26 -0700
commit: 4c207c50ea35abf98f087bbcda8c95b23c4bb3b1
parent: 1f7a44f63e6c782c9c2aa9f18f40c23914e6b46a
Commit Summary:
Diffstat:
1 file changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 51540b291738..342d26432553 100644
--- a/Makefile
+++ b/Makefile
@@ -921,15 +921,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized)
# disable invalid "can't wrap" optimizations for signed / pointers
KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
-# clang sets -fmerge-all-constants by default as optimization, but this
-# is non-conforming behavior for C and in fact breaks the kernel, so we
-# need to disable it here generally.
-KBUILD_CFLAGS += $(call cc-option,-fno-merge-all-constants)
-
-# for gcc -fno-merge-all-constants disables everything, but it is fine
-# to have actual conforming behavior enabled.
-KBUILD_CFLAGS += $(call cc-option,-fmerge-constants)
-
# Make sure -fstack-check isn't enabled (like gentoo apparently did)
KBUILD_CFLAGS += $(call cc-option,-fno-stack-check,)