summaryrefslogtreecommitdiffstats
path: root/toolchain/binutils
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-28 02:29:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-28 02:29:01 +0000
commit089411e72de61c40a32170dc8503e1afbd71cf00 (patch)
tree7d3bc2844d3b23a32a5772a2e4c5d2d6597d45c1 /toolchain/binutils
parent87d30b549d1dc570d0037d021343ab9d4b0f2017 (diff)
binutils: backport a fix for broken relocation entries on mips with -fPIE, fixes dbus-server crash with sstrip
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25188 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/binutils')
-rw-r--r--toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch b/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
new file mode 100644
index 000000000..3a5dc6699
--- /dev/null
+++ b/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
@@ -0,0 +1,15 @@
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -5696,9 +5696,9 @@ mips_elf_create_dynamic_relocation (bfd
+
+ /* We must now calculate the dynamic symbol table index to use
+ in the relocation. */
+- if (h != NULL
+- && (!h->root.def_regular
+- || (info->shared && !info->symbolic && !h->root.forced_local)))
++ if (!(h == NULL
++ || (h->root.def_regular
++ && (info->executable || info->symbolic || h->root.forced_local))))
+ {
+ indx = h->root.dynindx;
+ if (SGI_COMPAT (output_bfd))