[binutils-gdb] Add sysroot for ld -rpath search

Alan Modra amodra@sourceware.org
Sat Mar 11 13:20:00 GMT 2017


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=118aa6cf395aec093fe12d7fb2d05441791a93fa

commit 118aa6cf395aec093fe12d7fb2d05441791a93fa
Author: Alan Modra <amodra@gmail.com>
Date:   Sat Mar 11 23:37:02 2017 +1030

    Add sysroot for ld -rpath search
    
    	* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Add
    	sysroot for -rpath search.

Diff:
---
 ld/ChangeLog          | 5 +++++
 ld/emultempl/elf32.em | 2 ++
 2 files changed, 7 insertions(+)

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;
 	    }



More information about the Binutils-cvs mailing list