diff options
author | Sam Ravnborg <sam@neptun.(none)> | 2007-10-14 16:21:35 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-14 16:21:35 -0400 |
commit | a0f97e06a43cf524e616f09e6af3398e1e9c1c5b (patch) | |
tree | 2503b24bdbc144aea9ea5bde6ead94b3406eaf98 /arch/x86/boot | |
parent | 9a39e273d4df0560c724c5fe71f6314a0583ca2b (diff) |
kbuild: enable 'make CFLAGS=...' to add additional options to CC
The variable CFLAGS is a wellknown variable and the usage by
kbuild may result in unexpected behaviour.
On top of that several people over time has asked for a way to
pass in additional flags to gcc.
This patch replace use of CFLAGS with KBUILD_CFLAGS all over the
tree and enabling one to use:
make CFLAGS=...
to specify additional gcc commandline options.
One usecase is when trying to find gcc bugs but other
use cases has been requested too.
Patch was tested on following architectures:
alpha, arm, i386, x86_64, mips, sparc, sparc64, ia64, m68k
Test was simple to do a defconfig build, apply the patch and check
that nothing got rebuild.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r-- | arch/x86/boot/Makefile | 4 | ||||
-rw-r--r-- | arch/x86/boot/compressed/Makefile_32 | 2 | ||||
-rw-r--r-- | arch/x86/boot/compressed/Makefile_64 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index cb1035f2b7e9..646292aaf1fc 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile | |||
@@ -50,7 +50,7 @@ HOSTCFLAGS_build.o := $(LINUXINCLUDE) | |||
50 | # that way we can complain to the user if the CPU is insufficient. | 50 | # that way we can complain to the user if the CPU is insufficient. |
51 | cflags-i386 := | 51 | cflags-i386 := |
52 | cflags-x86_64 := -m32 | 52 | cflags-x86_64 := -m32 |
53 | CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ | 53 | KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ |
54 | $(cflags-$(ARCH)) \ | 54 | $(cflags-$(ARCH)) \ |
55 | -Wall -Wstrict-prototypes \ | 55 | -Wall -Wstrict-prototypes \ |
56 | -march=i386 -mregparm=3 \ | 56 | -march=i386 -mregparm=3 \ |
@@ -61,7 +61,7 @@ CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ | |||
61 | $(call cc-option, -fno-unit-at-a-time)) \ | 61 | $(call cc-option, -fno-unit-at-a-time)) \ |
62 | $(call cc-option, -fno-stack-protector) \ | 62 | $(call cc-option, -fno-stack-protector) \ |
63 | $(call cc-option, -mpreferred-stack-boundary=2) | 63 | $(call cc-option, -mpreferred-stack-boundary=2) |
64 | AFLAGS := $(CFLAGS) -D__ASSEMBLY__ | 64 | AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ |
65 | 65 | ||
66 | $(obj)/zImage: IMAGE_OFFSET := 0x1000 | 66 | $(obj)/zImage: IMAGE_OFFSET := 0x1000 |
67 | $(obj)/zImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) | 67 | $(obj)/zImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) |
diff --git a/arch/x86/boot/compressed/Makefile_32 b/arch/x86/boot/compressed/Makefile_32 index 22613c652d22..e43ff7c56e6e 100644 --- a/arch/x86/boot/compressed/Makefile_32 +++ b/arch/x86/boot/compressed/Makefile_32 | |||
@@ -11,7 +11,7 @@ EXTRA_AFLAGS := -traditional | |||
11 | LDFLAGS_vmlinux := -T | 11 | LDFLAGS_vmlinux := -T |
12 | hostprogs-y := relocs | 12 | hostprogs-y := relocs |
13 | 13 | ||
14 | CFLAGS := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ | 14 | KBUILD_CFLAGS := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ |
15 | -fno-strict-aliasing -fPIC \ | 15 | -fno-strict-aliasing -fPIC \ |
16 | $(call cc-option,-ffreestanding) \ | 16 | $(call cc-option,-ffreestanding) \ |
17 | $(call cc-option,-fno-stack-protector) | 17 | $(call cc-option,-fno-stack-protector) |
diff --git a/arch/x86/boot/compressed/Makefile_64 b/arch/x86/boot/compressed/Makefile_64 index dc6b3380cc45..3013ad01fe69 100644 --- a/arch/x86/boot/compressed/Makefile_64 +++ b/arch/x86/boot/compressed/Makefile_64 | |||
@@ -6,11 +6,11 @@ | |||
6 | 6 | ||
7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o | 7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o |
8 | 8 | ||
9 | CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2 \ | 9 | KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2 \ |
10 | -fno-strict-aliasing -fPIC -mcmodel=small \ | 10 | -fno-strict-aliasing -fPIC -mcmodel=small \ |
11 | $(call cc-option, -ffreestanding) \ | 11 | $(call cc-option, -ffreestanding) \ |
12 | $(call cc-option, -fno-stack-protector) | 12 | $(call cc-option, -fno-stack-protector) |
13 | AFLAGS := $(CFLAGS) -D__ASSEMBLY__ | 13 | AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ |
14 | LDFLAGS := -m elf_x86_64 | 14 | LDFLAGS := -m elf_x86_64 |
15 | 15 | ||
16 | LDFLAGS_vmlinux := -T | 16 | LDFLAGS_vmlinux := -T |