summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-28 10:35:06 +0100
committerIngo Molnar <mingo@elte.hu>2012-02-28 10:35:06 +0100
commit8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b (patch)
tree9b7036867d05102b6d4b7a3514b79f804c7cab18 /arch/x86/Makefile
parentx32: Warn and disable rather than error if binutils too old (diff)
downloadlinux-8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b.tar.xz
linux-8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b.zip
x86/x32: Fix the binutils auto-detect
Fix: arch/x86/Makefile:96: *** recipe commences before first target. Stop. Cc: H. Peter Anvin <hpa@linux.intel.com> Cc: H. J. Lu <hjl.tools@gmail.com> Link: http://lkml.kernel.org/r/1329696488-16970-1-git-send-email-hpa@zytor.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
-rw-r--r--arch/x86/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 31bb1eb1216a..968dbe24a255 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -88,13 +88,13 @@ ifdef CONFIG_X86_X32
$(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" - && \
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
- ifeq ($(x32_ld_ok),y)
- CONFIG_X86_X32_ABI := y
- KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
- KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
- else
- $(warning CONFIG_X86_X32 enabled but no binutils support)
- endif
+ ifeq ($(x32_ld_ok),y)
+ CONFIG_X86_X32_ABI := y
+ KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
+ KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
+ else
+ $(warning CONFIG_X86_X32 enabled but no binutils support)
+ endif
endif
export CONFIG_X86_X32_ABI