From 6f2ef5f590ac789d01b27e3463d0d69cb339b4e4 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 14 Mar 2013 08:56:05 +0000 Subject: [PATCH] * emulparams/aarch64linux.sh (LIBPATH_SUFFIX): Set to 64 for aarch64linux* emulations. --- ld/ChangeLog | 5 +++++ ld/emulparams/aarch64linux.sh | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index e01cc734dcd..1bb67a30e05 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2013-03-14 Jakub Jelinek + + * emulparams/aarch64linux.sh (LIBPATH_SUFFIX): Set to 64 for + aarch64linux* emulations. + 2013-03-07 Alan Modra * ldfile.c (ldfile_open_command_file_1): Return after einfo diff --git a/ld/emulparams/aarch64linux.sh b/ld/emulparams/aarch64linux.sh index a5a2500ce71..4a0fca9f155 100644 --- 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 -- 2.30.2