From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32043 invoked by alias); 23 Apr 2012 21:37:54 -0000 Received: (qmail 32016 invoked by uid 22791); 23 Apr 2012 21:37:52 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-wi0-f177.google.com (HELO mail-wi0-f177.google.com) (209.85.212.177) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 23 Apr 2012 21:37:38 +0000 Received: by wibhj13 with SMTP id hj13so6373wib.12 for ; Mon, 23 Apr 2012 14:37:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding:x-gm-message-state; bh=2ZCVkm4Xcz/bMF5G3n7tVl6m2KX1KniqPvX+Eidck5c=; b=k52RGRpAj4MeOgvsVE+nBNW5bSeTWR5V9FEByUTMR47f8/eBU5v1mK259cgnwe5XPJ ANBfyBRahYjh0LM7fiywQKdFl6SsnHfZw7k9xulxDeMmg7ELjV3aSY9uYqP5cNeU0NWs wjoqtvzDHwWNgRzuU7pP/FS84hXAwixtN8+aNFHzOCNW29JvQKnlpz0CYsCeGP+CJ4CE AjpUGIvYzQQDefVN6XKZRApGMnG9PG2Q+esTqUsCO3lK6a47OhcfnUaG22U0G/kA2AeP 6lTFM7pJLsyA0dxlaf67gUfeM244e582R5dFG6Lds76F/6noWY7Ic5yP4MDZKlVmm/Op 8GLQ== Received: by 10.180.92.71 with SMTP id ck7mr1595783wib.21.1335217057201; Mon, 23 Apr 2012 14:37:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.216.48.135 with HTTP; Mon, 23 Apr 2012 14:36:41 -0700 (PDT) In-Reply-To: <4F9576DE.9070608@arm.com> References: <4F9576DE.9070608@arm.com> From: Michael Hope Date: Mon, 23 Apr 2012 21:37:00 -0000 Message-ID: Subject: Re: [PATCH v2] ARM: Use different linker path for hardfloat ABI To: Richard Earnshaw Cc: GCC Patches , "cross-distro@lists.linaro.org" , "libc-ports@sourceware.org" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQnoXWTk2LxS5/mu8Bjm/f5YJn2mJ9fEBwsJMNYC1dvtt8Qhapxl3z9rsebbryfSUrhTmRuL X-IsSubscribed: yes Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-04/txt/msg00147.txt.bz2 On 24 April 2012 03:35, Richard Earnshaw wrote: > On 22/04/12 23:20, Michael Hope wrote: >> Change the dynamic linker path for ARM hard float executables. >> Matches the path discussed and agreed on last week[1]. =A0Carlos will >> follow up with the matching patch to GLIBC[2]. =A0I'm happy to if he's >> busy. >> >> OK for trunk? >> >> -- Michael >> [1] http://sourceware.org/ml/libc-ports/2012-04/msg00060.html >> [2] http://sourceware.org/ml/libc-ports/2012-04/msg00064.html >> >> 2012-04-23 =A0Michael Hope =A0 >> >> =A0 =A0 =A0 * config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_HARD_FLOAT):= Define. >> =A0 =A0 =A0 (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): Define. >> =A0 =A0 =A0 (GLIBC_DYNAMIC_LINKER): Redefine to use the hard float path. >> >> diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h >> index 80bd825..3ddf812 100644 >> --- a/gcc/config/arm/linux-eabi.h >> +++ b/gcc/config/arm/linux-eabi.h >> @@ -62,7 +62,11 @@ >> =A0/* Use ld-linux.so.3 so that it will be possible to run "classic" >> =A0 =A0 GNU/Linux binaries on an EABI system. =A0*/ >> =A0#undef =A0GLIBC_DYNAMIC_LINKER >> -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" >> +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" >> +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" >> +#define GLIBC_DYNAMIC_LINKER \ >> + =A0 "%{mfloat-abi=3Dhard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ >> + =A0 =A0%{!mfloat-abi=3Dhard:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "}" >> >> =A0/* At this point, bpabi.h will have clobbered LINK_SPEC. =A0We want to >> =A0 =A0 use the GNU/Linux version, not the generic BPABI version. =A0*/ >> > > > I think this should handle having the hard-float variant as the default > more gracefully, so something like: > > > -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" > +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" > +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" > +#if TARGET_DEFAULT_FLOAT_ABI =3D=3D ARM_FLOAT_ABI_HARD > +#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_HARD_FLOAT > +#else > +#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT > +#endif > +#define GLIBC_DYNAMIC_LINKER \ > + =A0 "%{mfloat-abi=3Dhard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ > + =A0 =A0%{mfloat-abi=3Dsoft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ > + =A0 =A0%{!mfloat-abi=3D*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" > > But I haven't tested any of that. It tests just fine when setting the float ABI at configure time or explicitly. Updated patch is below. I prefer the original, shorter version but the new one is easier for someone else to understand. OK for trunk? -- Michael 2012-04-24 Michael Hope Richard Earnshaw * config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): Define. (GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define. (GLIBC_DYNAMIC_LINKER_DEFAULT): Define. (GLIBC_DYNAMIC_LINKER): Redefine to use the hard float path. diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h index 80bd825..2ace6f0 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h @@ -62,7 +62,17 @@ /* Use ld-linux.so.3 so that it will be possible to run "classic" GNU/Linux binaries on an EABI system. */ #undef GLIBC_DYNAMIC_LINKER -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" +#if TARGET_DEFAULT_FLOAT_ABI =3D=3D ARM_FLOAT_ABI_HARD +#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_HARD_FLOAT +#else +#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT +#endif +#define GLIBC_DYNAMIC_LINKER \ + "%{mfloat-abi=3Dhard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ + %{mfloat-abi=3Dsoft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=3D*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to use the GNU/Linux version, not the generic BPABI version. */