public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Richard Earnshaw <rearnsha@arm.com>
To: Michael Hope <michael.hope@linaro.org>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>,
	 "cross-distro@lists.linaro.org" <cross-distro@lists.linaro.org>,
	"libc-ports@sourceware.org" <libc-ports@sourceware.org>
Subject: Re: [PATCH v2] ARM: Use different linker path for hardfloat ABI
Date: Mon, 23 Apr 2012 15:37:00 -0000	[thread overview]
Message-ID: <4F9576DE.9070608@arm.com> (raw)
In-Reply-To: <CANLjY-kZ6FakmtKkHjjC2YNgCBkydiNq8F81Fb7SgW0RE6iF5w@mail.gmail.com>

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].  Carlos will
> follow up with the matching patch to GLIBC[2].  I'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  Michael Hope  <michael.hope@linaro.org>
> 
> 	* config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define.
> 	(GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): 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..3ddf812 100644
> --- a/gcc/config/arm/linux-eabi.h
> +++ b/gcc/config/arm/linux-eabi.h
> @@ -62,7 +62,11 @@
>  /* 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"
> +#define GLIBC_DYNAMIC_LINKER \
> +   "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
> +    %{!mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "}"
> 
>  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
>     use the GNU/Linux version, not the generic BPABI version.  */
> 


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 == 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=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
+    %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+    %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"

But I haven't tested any of that.

R.

  reply	other threads:[~2012-04-23 15:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-22 22:20 Michael Hope
2012-04-23 15:37 ` Richard Earnshaw [this message]
2012-04-23 21:37   ` Michael Hope
2012-04-24 13:32     ` Richard Earnshaw
2012-04-26 20:21     ` Carlos O'Donell
2012-04-26 23:27       ` Michael Hope
2012-04-30 15:24         ` Richard Earnshaw
2012-04-30 21:48           ` Michael Hope
2012-04-30 22:01             ` Jeff Law
2012-05-01  2:44               ` Michael Hope
2012-05-01  3:46                 ` Jeff Law
2012-05-01  8:52             ` Richard Earnshaw
2012-05-23  7:13               ` Andreas Jaeger
2012-05-23  7:56                 ` Richard Earnshaw
2012-05-23  8:01                   ` Andreas Jaeger
2012-05-23  8:18                     ` Richard Guenther
2012-05-23 14:15                       ` Mike Frysinger
2012-05-23 21:12                         ` Michael Hope
2012-05-24  4:08                           ` Mike Frysinger
2012-05-24  8:15                           ` Andrew Haley
2012-05-25  0:27                             ` Mike Frysinger
2012-05-25  8:24                               ` Andrew Haley
2012-05-24 17:08                       ` Jakub Jelinek
2012-04-23 19:58 ` Carlos O'Donell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F9576DE.9070608@arm.com \
    --to=rearnsha@arm.com \
    --cc=cross-distro@lists.linaro.org \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libc-ports@sourceware.org \
    --cc=michael.hope@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).