[binutils-gdb/binutils-2_29-branch] ld: Replace --rpath with -Wl, --rpath,

[H.J.Lu]

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

commit ffb6dbfed645366a6666708535203e0663e7be45
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Aug 8 14:13:46 2017 -0700

    ld: Replace --rpath with -Wl,--rpath,
    
    "--rpath ../bfd/.libs ../bfd/.libs/libbfd.so" isn't a valid compiler
    command-line option.  We should use -Wl,--rpath, instead of --rpath.
    
    	PR ld/21923
    	* configure.ac (TESTBFDLIB): Replace --rpath with -Wl,--rpath,
    	for --disable-static.
    	* configure: Regenerated.
    
    (cherry picked from commit fe22cbc418b35ed6ea3252a204bd351f8c201e0b and
     9165f4548be8612161fb90cfad9bd0cc6a752c90)

Diff:
---
 ld/ChangeLog    | 7 +++++++
 ld/configure    | 2 +-
 ld/configure.ac | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 61458eb..8b656e6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,12 @@
 2017-08-13  H.J. Lu  <hongjiu.lu@intel.com>
 
+	PR ld/21923
+	* configure.ac (TESTBFDLIB): Replace --rpath with -Wl,--rpath,
+	for --disable-static.
+	* configure: Regenerated.
+
+2017-08-13  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* testsuite/ld-i386/i386.exp: Run pr21884-nacl.
 	* testsuite/ld-x86-64/x86-64.exp: Likewise.
 	* testsuite/ld-i386/pr21884.d: Don't run on nacl targets.
diff --git a/ld/configure b/ld/configure
index 7b66a4f..20fb84d 100755
--- a/ld/configure
+++ b/ld/configure
@@ -17255,7 +17255,7 @@ EMULATION_LIBPATH=$all_libpath
 
 
 if test x${enable_static} = xno; then
-  TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
+  TESTBFDLIB="-Wl,--rpath,../bfd/.libs ../bfd/.libs/libbfd.so"
 else
   TESTBFDLIB="../bfd/.libs/libbfd.a"
 fi
diff --git a/ld/configure.ac b/ld/configure.ac
index 34315e6..6f25d28 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -436,7 +436,7 @@ EMULATION_LIBPATH=$all_libpath
 AC_SUBST(EMULATION_LIBPATH)
 
 if test x${enable_static} = xno; then
-  TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
+  TESTBFDLIB="-Wl,--rpath,../bfd/.libs ../bfd/.libs/libbfd.so"
 else
   TESTBFDLIB="../bfd/.libs/libbfd.a"
 fi