diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-30 06:03:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-30 06:36:50 -0400 |
| commit | 83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f (patch) | |
| tree | c265ffd386c5ad05d61b19d778caeb0fd6208f04 /arch/x86/boot | |
| parent | fd0731944333db6e9e91b6954c6ef95f4b71ab04 (diff) | |
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.S | 2 |
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 ffcb19134bf7..0d26c92d3c7d 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) | 1 | OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) |
| 2 | 2 | ||
| 3 | #undef i386 | ||
| 4 | |||
| 3 | #ifdef CONFIG_X86_64 | 5 | #ifdef CONFIG_X86_64 |
| 4 | OUTPUT_ARCH(i386:x86-64) | 6 | OUTPUT_ARCH(i386:x86-64) |
| 5 | ENTRY(startup_64) | 7 | ENTRY(startup_64) |