]> 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)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 30 Oct 2012 23:26:52 +0000 (23:26 +0000)
commitadb0f4a1995dc2a166313ac5ddc0a2f4a5c2d4c6
treefa01eca0b4b234c406e1766385ffe7f549338a4f
parent87c4bcc0d96ed2e72f92b8e937a55ef494135ca8
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/s390/boot/compressed/vmlinux.lds.S
arch/s390/kernel/vmlinux.lds.S