[tip:x86/x32] x86/x32: Fix the binutils auto-detect
From: tip-bot for Ingo Molnar
Date: Tue Feb 28 2012 - 04:50:26 EST
Commit-ID: 8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b
Gitweb: http://git.kernel.org/tip/8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Tue, 28 Feb 2012 10:35:06 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 28 Feb 2012 10:35:06 +0100
x86/x32: Fix the binutils auto-detect
Fix:
arch/x86/Makefile:96: *** recipe commences before first target. Stop.
Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: H. J. Lu <hjl.tools@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1329696488-16970-1-git-send-email-hpa@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/Makefile | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 31bb1eb..968dbe2 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/