X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=Makefile;h=342d2643255329c93d869fc04964532b0d2d452e;hb=19b629c9795bfe67bf77be8fb611b84424b56d91;hp=51540b29173889717d373d501f62332c53401a31;hpb=af9db1d6632b726a2351426ab8f34374f6f38690;p=linux-2.6-microblaze.git

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