aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2017-03-11 23:37:02 +1030
committerAlan Modra <amodra@gmail.com>2017-03-11 23:40:21 +1030
commit118aa6cf395aec093fe12d7fb2d05441791a93fa (patch)
treea1515df3dde1519d0a1862596708b02fab1dce2f
parent316a1245fe31e327223ca66797b789eaf9544c2c (diff)
downloadgdb-118aa6cf395aec093fe12d7fb2d05441791a93fa.zip
gdb-118aa6cf395aec093fe12d7fb2d05441791a93fa.tar.gz
gdb-118aa6cf395aec093fe12d7fb2d05441791a93fa.tar.bz2
Add sysroot for ld -rpath search
* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Add sysroot for -rpath search.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/emultempl/elf32.em2
2 files changed, 7 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f4baea8..86d9378 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@
2017-03-11 Alan Modra <amodra@gmail.com>
+ * emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Add
+ sysroot for -rpath search.
+
+2017-03-11 Alan Modra <amodra@gmail.com>
+
* emultempl/elf32.em (gld${EMULATION_NAME}_add_sysroot): Rewrite.
Only prefix absolute paths with sysroot. Handle DOS paths.
(gld${EMULATION_NAME}_check_ld_elf_hints): Constify variable.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 16220d5..d4837d0 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1446,7 +1446,9 @@ fragment <<EOF
path = command_line.rpath;
if (path)
{
+ path = gld${EMULATION_NAME}_add_sysroot (path);
found = gld${EMULATION_NAME}_search_needed (path, &n, force);
+ free ((char *) path);
if (found)
break;
}