summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2009-04-30 12:03:16 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-30 12:36:50 +0200
commit83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f (patch)
treec265ffd386c5ad05d61b19d778caeb0fd6208f04 /arch/x86/boot
parentfd0731944333db6e9e91b6954c6ef95f4b71ab04 (diff)
downloadop-kernel-dev-83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f.zip
op-kernel-dev-83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f.tar.gz
x86: boot/compressed/vmlinux.lds.S: fix build of bzImage with 64 bit compiler
Jesper reported that he saw following build issue: > ld:arch/x86/boot/compressed/vmlinux.lds:9: syntax error > make[2]: *** [arch/x86/boot/compressed/vmlinux] Error 1 > make[1]: *** [arch/x86/boot/compressed/vmlinux] Error 2 > make: *** [bzImage] Error 2 CPP defines the symbol "i386" to "1". Undefine this to fix it. [ Impact: build fix with certain tool chains ] Reported-by: Jesper Dangaard Brouer <jdb@comx.dk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> LKML-Reference: <alpine.LFD.2.00.0904260958190.3101@localhost.localdomain> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/vmlinux.lds.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S
index ffcb1913..0d26c92 100644
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@@ -1,5 +1,7 @@
OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
+#undef i386
+
#ifdef CONFIG_X86_64
OUTPUT_ARCH(i386:x86-64)
ENTRY(startup_64)
OpenPOWER on IntegriCloud