From patchwork Sun Jan 31 11:22:52 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: 44110 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 3BC0CB7D51 for ; Sun, 31 Jan 2010 22:30:33 +1100 (EST) Received: from localhost ([127.0.0.1]:42308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NbXv3-0003DS-Bv for incoming@patchwork.ozlabs.org; Sun, 31 Jan 2010 06:24:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NbXth-0003CO-Fb for qemu-devel@nongnu.org; Sun, 31 Jan 2010 06:23:21 -0500 Received: from [199.232.76.173] (port=50782 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NbXtf-0003C9-UE for qemu-devel@nongnu.org; Sun, 31 Jan 2010 06:23:19 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NbXtc-0004nX-WE for qemu-devel@nongnu.org; Sun, 31 Jan 2010 06:23:19 -0500 Received: from duck.dooz.org ([194.146.227.125]:52122) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NbXta-0004lN-G3 for qemu-devel@nongnu.org; Sun, 31 Jan 2010 06:23:14 -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 BC91AC809C; Sun, 31 Jan 2010 12:23:11 +0100 (CET) Received: by bee.dooz.org (Postfix, from userid 1000) id DC66412972; Sun, 31 Jan 2010 12:23:07 +0100 (CET) From: =?UTF-8?q?Lo=C3=AFc=20Minier?= To: qemu-devel@nongnu.org Date: Sun, 31 Jan 2010 12:22:52 +0100 Message-Id: <1264936972-29634-1-git-send-email-lool@dooz.org> X-Mailer: git-send-email 1.6.5 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: =?UTF-8?q?Lo=C3=AFc=20Minier?= Subject: [Qemu-devel] [PATCH] Fix missing symbols in .rel/.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 Fix .rel.plt sections in the output to not only include .rel.plt sections from the input but also the .rel.iplt sections and to define the hidden symbols __rel_iplt_start and __rel_iplt_end around .rel.iplt as otherwise we get undefined references to these when linking statically to a multilib libc.a. This fixes the static build under i386. Apply similar logic to rela.plt/.iplt and __rela_iplt/_plt_start/_end to fix the static build under amd64. Signed-off-by: Loïc Minier --- i386.ld | 16 ++++++++++++++-- x86_64.ld | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/i386.ld b/i386.ld index f2dafec..f8df7bf 100644 --- a/i386.ld +++ b/i386.ld @@ -39,8 +39,20 @@ SECTIONS .rela.fini : { *(.rela.fini) } .rel.bss : { *(.rel.bss) } .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rel.plt : + { + *(.rel.plt) + PROVIDE_HIDDEN (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE_HIDDEN (__rel_iplt_end = .); + } + .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..46d8d4d 100644 --- a/x86_64.ld +++ b/x86_64.ld @@ -35,8 +35,20 @@ SECTIONS .rela.got : { *(.rela.got) } .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) } + .rel.plt : + { + *(.rel.plt) + PROVIDE_HIDDEN (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE_HIDDEN (__rel_iplt_end = .); + } + .rela.plt : + { + *(.rela.plt) + PROVIDE_HIDDEN (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE_HIDDEN (__rela_iplt_end = .); + } .init : { KEEP (*(.init))