* emulparams/aarch64linux.sh (LIBPATH_SUFFIX): Set to 64 for

	aarch64linux* emulations.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e01cc734dcdb9cc3af030a1002abd5342d982bdf..1bb67a30e057caaea61d924b1b28b89078019f80 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+       * emulparams/aarch64linux.sh (LIBPATH_SUFFIX): Set to 64 for
+       aarch64linux* emulations.
+
 2013-03-07  Alan Modra  <amodra@gmail.com>
 
        * ldfile.c (ldfile_open_command_file_1): Return after einfo

diff --git a/ld/emulparams/aarch64linux.sh b/ld/emulparams/aarch64linux.sh
index a5a2500ce710a89d1d05800572c2ff335608f1b1..4a0fca9f1553d934cdd418bcf8d33f041a25a955 100644 (file)
--- a/ld/emulparams/aarch64linux.sh
+++ b/ld/emulparams/aarch64linux.sh
@@ -34,3 +34,13 @@ OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'
 ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }'
 # Ensure each PLT entry is aligned to a cache line.
 PLT=".plt          ${RELOCATING-0} : ALIGN(16) { *(.plt)${IREL_IN_PLT+ *(.iplt)} }"
+
+# Linux modifies the default library search path to first include
+# a 64-bit specific directory.
+case "$target" in
+  aarch64*-linux*)
+    case "$EMULATION_NAME" in
+      aarch64linux*) LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac