diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-04-01 20:35:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:34:45 -0400 |
commit | 95a38f34635bdf06089de763b4becbc957694977 (patch) | |
tree | df0b1c3bc0406c5f570613e8ac74aa085d4dcdf6 | |
parent | a7f8c50d90a4e983c456ae75e534b5cd6c03674b (diff) |
x86, setup: compile with -DDISABLE_BRANCH_PROFILING
Impact: code size reduction (possibly critical)
The x86 boot and decompression code has no use of the branch profiling
constructs, so disable them. This would bloat the setup code by as
much as 14K, eating up a fairly large chunk of the 32K area we are
guaranteed to have.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/boot/Makefile | 3 | ||||
-rw-r--r-- | arch/x86/boot/compressed/Makefile | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index fb737ce5888d..6633b6e7505a 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile | |||
@@ -57,6 +57,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE | |||
57 | # How to compile the 16-bit code. Note we always compile for -march=i386, | 57 | # How to compile the 16-bit code. Note we always compile for -march=i386, |
58 | # that way we can complain to the user if the CPU is insufficient. | 58 | # that way we can complain to the user if the CPU is insufficient. |
59 | KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ | 59 | KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ |
60 | -DDISABLE_BRANCH_PROFILING \ | ||
60 | -Wall -Wstrict-prototypes \ | 61 | -Wall -Wstrict-prototypes \ |
61 | -march=i386 -mregparm=3 \ | 62 | -march=i386 -mregparm=3 \ |
62 | -include $(srctree)/$(src)/code16gcc.h \ | 63 | -include $(srctree)/$(src)/code16gcc.h \ |
@@ -66,7 +67,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ | |||
66 | $(call cc-option, -fno-unit-at-a-time)) \ | 67 | $(call cc-option, -fno-unit-at-a-time)) \ |
67 | $(call cc-option, -fno-stack-protector) \ | 68 | $(call cc-option, -fno-stack-protector) \ |
68 | $(call cc-option, -mpreferred-stack-boundary=2) | 69 | $(call cc-option, -mpreferred-stack-boundary=2) |
69 | KBUILD_CFLAGS += $(call cc-option,-m32) | 70 | KBUILD_CFLAGS += $(call cc-option, -m32) |
70 | KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ | 71 | KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ |
71 | 72 | ||
72 | $(obj)/bzImage: asflags-y := $(SVGA_MODE) | 73 | $(obj)/bzImage: asflags-y := $(SVGA_MODE) |
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 3ca4c194b8e5..65551c9f8571 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile | |||
@@ -8,6 +8,7 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma h | |||
8 | 8 | ||
9 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 | 9 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 |
10 | KBUILD_CFLAGS += -fno-strict-aliasing -fPIC | 10 | KBUILD_CFLAGS += -fno-strict-aliasing -fPIC |
11 | KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING | ||
11 | cflags-$(CONFIG_X86_64) := -mcmodel=small | 12 | cflags-$(CONFIG_X86_64) := -mcmodel=small |
12 | KBUILD_CFLAGS += $(cflags-y) | 13 | KBUILD_CFLAGS += $(cflags-y) |
13 | KBUILD_CFLAGS += $(call cc-option,-ffreestanding) | 14 | KBUILD_CFLAGS += $(call cc-option,-ffreestanding) |