aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Makefile3
-rw-r--r--arch/x86/boot/compressed/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index d798e36d103c..a517852dad55 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -31,8 +31,7 @@ endif
31CODE16GCC_CFLAGS := -m32 -Wa,$(srctree)/arch/x86/boot/code16gcc.h 31CODE16GCC_CFLAGS := -m32 -Wa,$(srctree)/arch/x86/boot/code16gcc.h
32M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS)) 32M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS))
33 33
34REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \ 34REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \
35 -DDISABLE_BRANCH_PROFILING \
36 -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \ 35 -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \
37 -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ 36 -fno-strict-aliasing -fomit-frame-pointer -fno-pic \
38 -mno-mmx -mno-sse 37 -mno-mmx -mno-sse
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index f25e1530e064..f484ae0ece93 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -26,7 +26,7 @@ KCOV_INSTRUMENT := n
26targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ 26targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \
27 vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 27 vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4
28 28
29KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ -O2 29KBUILD_CFLAGS := -m$(BITS) -O2
30KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC) 30KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC)
31KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING 31KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
32cflags-$(CONFIG_X86_32) := -march=i386 32cflags-$(CONFIG_X86_32) := -march=i386