aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch
diff options
context:
space:
mode:
authorAndy Ross <andy.ross@windriver.com>2012-08-23 17:32:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-24 17:22:47 +0100
commitbccea580f1abb762d231f785a4e60c9cd368dcdf (patch)
treec0b272ccf1c1c226329c5d6b3b85b24fe2c7e18f /meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch
parentdd56ca611671233b8eec78aaa7e24b232654bc92 (diff)
downloadopenembedded-core-bccea580f1abb762d231f785a4e60c9cd368dcdf.tar.gz
openembedded-core-bccea580f1abb762d231f785a4e60c9cd368dcdf.tar.bz2
openembedded-core-bccea580f1abb762d231f785a4e60c9cd368dcdf.zip
ld: -rpath must search under sysroot
The -rpath argument would search the host filesystem for libraries, even when a sysroot was defined. For cross toolchains with targets compatible with the host architecture this can find incorrect libraries. Leave -rpath-link unmodified, as build systems in the wild are already using this to point to host directories. [YOCTO #2965] Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch b/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch
new file mode 100644
index 0000000000..955699ed7b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch
@@ -0,0 +1,38 @@
+ld: -rpath must search under sysroot
+
+The -rpath argument would search the host filesystem for libraries,
+even when a sysroot was defined. For cross toolchains with targets
+compatible with the host architecture this can find incorrect
+libraries. Leave -rpath-link unmodified, as build systems in the wild
+are already using this to point to host directories.
+
+Signed-off-by: Andy Ross <andy.ross@windriver.com>
+Upstream-Status: submitted (binutils@sourceware.org 2012-08-22)
+---
+ ld/emultempl/elf32.em | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index de51050..35e0e7e 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1263,9 +1263,13 @@ fragment <<EOF
+ EOF
+ if [ "x${USE_LIBPATH}" = xyes ] ; then
+ fragment <<EOF
+- if (gld${EMULATION_NAME}_search_needed (command_line.rpath,
+- &n, force))
+- break;
++ if (command_line.rpath) {
++ char *tmprp = gld${EMULATION_NAME}_add_sysroot (command_line.rpath);
++ found = gld${EMULATION_NAME}_search_needed (tmprp, &n, force);
++ free(tmprp);
++ if (found)
++ break;
++ }
+ EOF
+ fi
+ if [ "x${NATIVE}" = xyes ] ; then
+--
+1.7.11.2
+