[PATCH/AARCH64] Correct lib path and add interpreter name

[PATCH/AARCH64] Correct lib path and add interpreter name

[Andrew Pinski]

Hi,
  When I added the ilp32 support to binutils, I did not set the library path name correctly and I forgot
to add the interpreter name to them.  Both were also only agreed upon after I committed the original patches.

OK?  Build and tested for aarch64-linux-gnu with no regressions.

Thanks,
Andrew Pinski


	* emulparams/aarch64linux32.sh (LIBPATH_SUFFIX): Change to ilp32.
	(ELF_INTERPRETER_NAME): Define.
	* emulparams/aarch64linux32b.sh (ELF_INTERPRETER_NAME): Define.
---
 ld/ChangeLog                     |    6 ++++++
 ld/emulparams/aarch64linux32.sh  |    4 +++-
 ld/emulparams/aarch64linux32b.sh |    1 +
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 359e1d6..8874677 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-07  Andrew Pinski  <apinski@cavium.com>
+
+	* emulparams/aarch64linux32.sh (LIBPATH_SUFFIX): Change to ilp32.
+	(ELF_INTERPRETER_NAME): Define.
+	* emulparams/aarch64linux32b.sh (ELF_INTERPRETER_NAME): Define.
+
 2014-02-03  Alan Modra  <amodra@gmail.com>
 
 	* emultempl/ppc32elf.em (no_tls_get_addr_opt, emit_stub_syms)
diff --git a/ld/emulparams/aarch64linux32.sh b/ld/emulparams/aarch64linux32.sh
index 573b432..b84eb45 100644
--- a/ld/emulparams/aarch64linux32.sh
+++ b/ld/emulparams/aarch64linux32.sh
@@ -41,7 +41,9 @@ PLT=".plt          ${RELOCATING-0} : ALIGN(16) { *(.plt)${IREL_IN_PLT+ *(.iplt)}
 case "$target" in
   aarch64*-linux*)
     case "$EMULATION_NAME" in
-      aarch64linux*) LIBPATH_SUFFIX=32 ;;
+      aarch64linux*) LIBPATH_SUFFIX=ilp32 ;;
     esac
     ;;
 esac
+
+ELF_INTERPRETER_NAME=\"/lib/ld-linux-aarch64_ilp32.so.1\"
diff --git a/ld/emulparams/aarch64linux32b.sh b/ld/emulparams/aarch64linux32b.sh
index f878b18..e92feec 100644
--- a/ld/emulparams/aarch64linux32b.sh
+++ b/ld/emulparams/aarch64linux32b.sh
@@ -1,2 +1,3 @@
 . ${srcdir}/emulparams/aarch64linux32.sh
 OUTPUT_FORMAT="elf32-bigaarch64"
+ELF_INTERPRETER_NAME=\"/lib/ld-linux-aarch64_be_ilp32.so.1\"
-- 
1.7.2.5

Re: [PATCH/AARCH64] Correct lib path and add interpreter name

[Marcus Shawcroft]

On 7 February 2014 20:31, Andrew Pinski <pinskia@gmail.com> wrote:
> Hi,
>   When I added the ilp32 support to binutils, I did not set the library path name correctly and I forgot
> to add the interpreter name to them.  Both were also only agreed upon after I committed the original patches.
>
> OK?  Build and tested for aarch64-linux-gnu with no regressions.

Looks fine to me.  OK
/Marcus