From patchwork Mon Aug 3 12:46:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30556 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 5B314B6F20 for ; Tue, 4 Aug 2009 00:43:00 +1000 (EST) Received: from localhost ([127.0.0.1]:58185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXykS-0008Me-9j for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:42:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzh-0003j0-I0 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzd-0003gG-Sa for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:25 -0400 Received: from [199.232.76.173] (port=51711 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzd-0003g1-ME for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:21 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40867) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzd-00078w-0F for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:21 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CoK6Y007288; Mon, 3 Aug 2009 08:50:20 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CoJuK026812; Mon, 3 Aug 2009 08:50:19 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8Mv009715; Mon, 3 Aug 2009 08:50:17 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:44 +0200 Message-Id: <62bf1a77390156142323585582a4c65eb205dc29.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 53/81] refactor linker_script common part and change quoting 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 Signed-off-by: Juan Quintela --- configure | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f38eff6..4ba42b3 100755 --- a/configure +++ b/configure @@ -2069,34 +2069,35 @@ fi # generate LDFLAGS for targets ldflags="" +linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld" if test "$target_linux_user" = "yes" -o "$target_linux_user" = "yes" ; then case "$ARCH" in i386) if test "$gprof" = "yes" -o "$static" = "yes" ; then - ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld $ldflags' + ldflags="$linker_script $ldflags" else # WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object # that the kernel ELF loader considers as an executable. I think this # is the simplest way to make it self virtualizable! - ldflags='-Wl,-shared $ldflags' + ldflags="-Wl,-shared $ldflags" fi ;; sparc) # -static is used to avoid g1/g3 usage by the dynamic linker - ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static $ldflags' + ldflags="$linker_script -static $ldflags" ;; ia64) - ldflags='-Wl,-G0 -Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static $ldflags' + ldflags="-Wl,-G0 $linker_script -static $ldflags" ;; x86_64|ppc|ppc64|s390|sparc64|alpha|arm|m68k|mips|mips64) - ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld $ldflags' + ldflags="$linker_script $ldflags" ;; esac fi if test "$target_softmmu" = "yes" ; then case "$ARCH" in ia64) - ldflags='-Wl,-G0 -Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static $ldflags' + ldflags="-Wl,-G0 $linker_script -static $ldflags" ;; esac fi