summaryrefslogtreecommitdiff
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-30 13:32:23 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:32:23 +0100
commit4ba7e5cd499a72983e6d011e76c1d8fad896d310 (patch)
treec6b92e1a5556e31f840cfff6d5b86f02421f04da /arch/x86/Makefile
parent25dfeeb757bdf06521d65973676b21dac1d26d20 (diff)
x86: biarch support for 32 bit builds beautified
There were no reason to mess around with CC, AS and LD. Fixing this up avoided duplicated option for ld. A small fixlet were needed in boot/Makefile which assumed that CC were modified. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 0c5b4072d134..bfe061de8ed6 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -15,18 +15,15 @@ export BITS
ifeq ($(CONFIG_X86_32),y)
BITS := 32
UTS_MACHINE := i386
+ CHECKFLAGS += -D__i386__
- HAS_BIARCH := $(call cc-option-yn, -m32)
- ifeq ($(HAS_BIARCH),y)
- AS := $(AS) --32
- LD := $(LD) -m elf_i386
- CC := $(CC) -m32
- endif
+ biarch := $(call cc-option,-m32)
+ KBUILD_AFLAGS += $(biarch)
+ KBUILD_CFLAGS += $(biarch)
ifdef CONFIG_RELOCATABLE
LDFLAGS_vmlinux := --emit-relocs
endif
- CHECKFLAGS += -D__i386__
KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return