s390: fix linker script for 31 bit builds
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Thu, 18 Oct 2012 09:11:01 +0000 (11:11 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 18 Oct 2012 15:50:10 +0000 (17:50 +0200)
commitc985cb37f1b39c2c8035af741a2a0b79f1fbaca7
tree25fdcf02ed4f45557341c8eb19b8d56c438d3b8a
parent0f58aac9af2e93a23cd5f33fed0388e350cf58b9
s390: fix linker script for 31 bit builds

Because of a change in the s390 arch backend of binutils (commit 23ecd77
"Pick the default arch depending on the target size" in binutils repo)
31 bit builds will fail since the linker would now try to create 64 bit
binary output.
Fix this by setting OUTPUT_ARCH to s390:31-bit instead of s390.
Thanks to Andreas Krebbel for figuring out the issue.

Fixes this build error:

  LD      init/built-in.o
s390x-4.7.2-ld: s390:31-bit architecture of input file
 `arch/s390/kernel/head.o' is incompatible with s390:64-bit output

Cc: Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/boot/compressed/vmlinux.lds.S
arch/s390/kernel/vmlinux.lds.S