From patchwork Sun Jan 17 11:59:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 43024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4DE84B7CE4 for ; Sun, 17 Jan 2010 23:05:43 +1100 (EST) Received: from localhost ([127.0.0.1]:33772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWTod-0003hX-3z for incoming@patchwork.ozlabs.org; Sun, 17 Jan 2010 07:01:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWTnD-0003cx-5j for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:59:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWTn8-0003T8-CR for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:59:42 -0500 Received: from [199.232.76.173] (port=35400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWTn8-0003Se-5z for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:59:38 -0500 Received: from duck.dooz.org ([194.146.227.125]:34108) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWTn7-0000F6-Ju for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:59:37 -0500 Received: from bee.dooz.org (serris.dooz.org [88.166.229.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by duck.dooz.org (Postfix) with ESMTP id DC8A3C809C for ; Sun, 17 Jan 2010 12:59:36 +0100 (CET) Received: by bee.dooz.org (Postfix, from userid 1000) id 0A5DB111D; Sun, 17 Jan 2010 12:59:33 +0100 (CET) Date: Sun, 17 Jan 2010 12:59:32 +0100 From: =?iso-8859-1?Q?Lo=EFc?= Minier To: qemu-devel@nongnu.org Message-ID: <20100117115932.GB23875@bee.dooz.org> MIME-Version: 1.0 Content-Disposition: inline X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH] Fix missing symbols in .rela.plt sections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hi there, Static builds of qemu on x86-64 (and probably i386) fail with: gcc -I/home/lool/git/savannah/qemu/slirp -Werror -m64 -Wold-style-definition -Wold-style-declaration -I. -I/home/lool/git/savannah/qemu -U_FORTIFY_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -I/home/lool/git/savannah/qemu/fpu -I/home/lool/git/savannah/qemu/tcg -I/home/lool/git/savannah/qemu/tcg/x86_64 -I.. -I/home/lool/git/savannah/qemu/target-arm -DNEED_CPU_H -I/home/lool/git/savannah/qemu/linux-user -I/home/lool/git/savannah/qemu/linux-user/arm -O2 -g -static -Wl,--warn-common -m64 -g -Wl,-T../config-host.ld -Wl,-T,/home/lool/git/savannah/qemu/x86_64.ld -o qemu-arm main.o syscall.o strace.o mmap.o signal.o thunk.o elfload.o linuxload.o uaccess.o gdbstub.o flatload.o gdbstub-xml.o nwfpe/fpa11.o nwfpe/fpa11_cpdo.o nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o nwfpe/double_cpdo.o nwfpe/extended_cpdo.o arm-semi.o -Wl,--whole-archive ../libuser/libuser.a libqemu.a -Wl,--no-whole-archive -lrt -lpthread -lm /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0xd4): undefined reference to `__rela_iplt_end' /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0xe5): undefined reference to `__rela_iplt_start' /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0x100): undefined reference to `__rela_iplt_start' /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0x10a): undefined reference to `__rela_iplt_start' /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0x10f): undefined reference to `__rela_iplt_start' /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/libc.a(elf-init.o): In function `__libc_csu_irel': (.text+0x114): undefined reference to `__rela_iplt_start' collect2: ld returned 1 exit status This is due to changes in binutils + glibc, qemu's linker script need to be adjusted to include these symbols. qemu's scripts weren't copying the .rela.iplt section at all, so I included this section and the __rela_iplt_start and __rela_iplt_end arount it. Tested by building qemu in static and shared mode for the arm-softmmu,i386-softmmu,x86_64-softmmu,arm-linux-user,i386-linux-user,x86_64-linux-user target-list; I also ran qemu for almost all combinations. Thanks, From ac0fe6dabaf05bf434e9c57d4f9b61d73f660e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 17 Jan 2010 12:09:38 +0100 Subject: [PATCH] Fix missing symbols in .rela.plt sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix .rela.plt sections in the output to not only include .rela.plt sections from the input but also the .rela.iplt sections and to define the hidden symbols __rela_iplt_start and __rela_iplt_end around .rela.iplt as otherwise we get undefined references to these when linking statically to a multilib libc.a. Signed-off-by: Loïc Minier --- i386.ld | 8 +++++++- x86_64.ld | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/i386.ld b/i386.ld index f2dafec..bb245a7 100644 --- a/i386.ld +++ b/i386.ld @@ -40,7 +40,13 @@ SECTIONS .rel.bss : { *(.rel.bss) } .rela.bss : { *(.rela.bss) } .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rela.plt : + { + *(.rela.plt) + PROVIDE_HIDDEN (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE_HIDDEN (__rela_iplt_end = .); + } .init : { *(.init) } =0x47ff041f .text : { diff --git a/x86_64.ld b/x86_64.ld index 24ea77d..684d2d7 100644 --- a/x86_64.ld +++ b/x86_64.ld @@ -36,7 +36,13 @@ SECTIONS .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rela.plt : + { + *(.rela.plt) + PROVIDE_HIDDEN (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE_HIDDEN (__rela_iplt_end = .); + } .init : { KEEP (*(.init)) -- 1.6.5