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/mips | |
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/mips')
-rw-r--r-- | arch/mips/Makefile | 6 | ||||
-rw-r--r-- | arch/mips/kernel/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index ebd5d02a7d78..64512abef61d 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -609,13 +609,13 @@ ifdef CONFIG_64BIT | |||
609 | endif | 609 | endif |
610 | 610 | ||
611 | AFLAGS += $(cflags-y) | 611 | AFLAGS += $(cflags-y) |
612 | CFLAGS += $(cflags-y) \ | 612 | KBUILD_CFLAGS += $(cflags-y) \ |
613 | -D"VMLINUX_LOAD_ADDRESS=$(load-y)" | 613 | -D"VMLINUX_LOAD_ADDRESS=$(load-y)" |
614 | 614 | ||
615 | LDFLAGS += -m $(ld-emul) | 615 | LDFLAGS += -m $(ld-emul) |
616 | 616 | ||
617 | ifdef CONFIG_MIPS | 617 | ifdef CONFIG_MIPS |
618 | CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ | 618 | CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -xc /dev/null | \ |
619 | egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \ | 619 | egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \ |
620 | sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/") | 620 | sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/") |
621 | ifdef CONFIG_64BIT | 621 | ifdef CONFIG_64BIT |
@@ -632,7 +632,7 @@ OBJCOPYFLAGS += --remove-section=.reginfo | |||
632 | # | 632 | # |
633 | 633 | ||
634 | CPPFLAGS_vmlinux.lds := \ | 634 | CPPFLAGS_vmlinux.lds := \ |
635 | $(CFLAGS) \ | 635 | $(KBUILD_CFLAGS) \ |
636 | -D"LOADADDR=$(load-y)" \ | 636 | -D"LOADADDR=$(load-y)" \ |
637 | -D"JIFFIES=$(JIFFIES)" \ | 637 | -D"JIFFIES=$(JIFFIES)" \ |
638 | -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" | 638 | -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" |
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index a2689f93c160..95a356ef3910 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -71,7 +71,7 @@ obj-$(CONFIG_PCSPEAKER) += pcspeaker.o | |||
71 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 71 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
72 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 72 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
73 | 73 | ||
74 | CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) | 74 | CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) |
75 | 75 | ||
76 | obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o | 76 | obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o |
77 | 77 | ||