]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Oct 2012 17:14:13 +0000 (10:14 -0700)
commit1b91a891bc337ecec08dea5436be0bbb03fec12b
tree700654d4be48dd58f88236b13012be07ca9de251
parentd641457de0939adaa140161127f2f72bcfe50b37
s390: fix linker script for 31 bit builds

commit c985cb37f1b39c2c8035af741a2a0b79f1fbaca7 upstream.

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>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/boot/compressed/vmlinux.lds.S
arch/s390/kernel/vmlinux.lds.S