diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2007-11-12 14:14:19 -0500 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2007-11-12 15:02:20 -0500 |
| commit | d746d647f31bd3664f4a23985b78654129ffc1db (patch) | |
| tree | 6caa461f889220551adb460e2f74b00d51c0e076 /arch/x86/boot | |
| parent | 2a113281f5cd2febbab21a93c8943f8d3eece4d3 (diff) | |
x86: do not use $(ARCH) when not needed
For x86 ARCH may say i386 or x86_64 and soon x86.
Rely on CONFIG_X64_32 to select between 32/64 or just
hardcode the value as appropriate.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 89dbf970e058..7a3116ccf387 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile | |||
| @@ -49,10 +49,10 @@ HOSTCFLAGS_build.o := $(LINUXINCLUDE) | |||
| 49 | 49 | ||
| 50 | # How to compile the 16-bit code. Note we always compile for -march=i386, | 50 | # How to compile the 16-bit code. Note we always compile for -march=i386, |
| 51 | # that way we can complain to the user if the CPU is insufficient. | 51 | # that way we can complain to the user if the CPU is insufficient. |
| 52 | cflags-i386 := | 52 | cflags-$(CONFIG_X86_32) := |
| 53 | cflags-x86_64 := -m32 | 53 | cflags-$(CONFIG_X86_64) := -m32 |
| 54 | KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ | 54 | KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ |
| 55 | $(cflags-$(ARCH)) \ | 55 | $(cflags-y) \ |
| 56 | -Wall -Wstrict-prototypes \ | 56 | -Wall -Wstrict-prototypes \ |
| 57 | -march=i386 -mregparm=3 \ | 57 | -march=i386 -mregparm=3 \ |
| 58 | -include $(srctree)/$(src)/code16gcc.h \ | 58 | -include $(srctree)/$(src)/code16gcc.h \ |