From 0f19ae1b00edd8238d25df99643f9d5a6f9a564a Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Thu, 15 Jul 2010 10:22:09 +0100 Subject: binutils-cross: fix '-fPIE' on mips platform Current binutils generates problematic relocation table for executable compiled with '-fPIE', such as dbus-daemon. That way ld.so.1 falls into segmentation fault when accessing bad reloc entry. This pulls back one fix from binutils CVS repo (1.267) to add PIE support back. Signed-off-by: Kevin Tian Signed-off-by: Richard Purdie --- .../binutils-2.20.1/binutils-mips-pie.patch | 29 ++++++++++++++++++++++ meta/packages/binutils/binutils_2.20.1.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch (limited to 'meta') diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch b/meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch new file mode 100644 index 0000000000..c71f0ad4db --- /dev/null +++ b/meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch @@ -0,0 +1,29 @@ +# "-fPIE" always triggers segmentation fault in ld.so.1 on mips platform, +# which was first saw on dbus-daemon. Below borrow the binutils fix from +# binutils bugzilla: +# +# http://sourceware.org/bugzilla/show_bug.cgi?id=10858 +# +# Its commit message says: +# * elfxx-mips.c (mips_elf_create_dynamic_relocation): Use section +# sym dynindx for relocs against defined syms in PIEs. +# +# It's in upstream CVS now (rev 1.267), but not in current release +# +# By Kevin Tian , 2010-07-15 + +diff --git a/elfxx-mips.c b/elfxx-mips.c +index 3a1c8ba..f6c2c1c 100644 +--- binutils-2.20.1.orig/bfd/elfxx-mips.c ++++ binutils-2.20.1/bfd/elfxx-mips.c +@@ -5688,9 +5688,7 @@ mips_elf_create_dynamic_relocation (bfd *output_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 && ! SYMBOL_REFERENCES_LOCAL (info, &h->root)) + { + indx = h->root.dynindx; + if (SGI_COMPAT (output_bfd)) diff --git a/meta/packages/binutils/binutils_2.20.1.bb b/meta/packages/binutils/binutils_2.20.1.bb index 2c67844eb9..3197b5efb3 100644 --- a/meta/packages/binutils/binutils_2.20.1.bb +++ b/meta/packages/binutils/binutils_2.20.1.bb @@ -24,6 +24,7 @@ SRC_URI = "\ file://binutils-uclibc-300-012_check_ldrunpath_length.patch \ file://binutils-uclibc-gas-needs-libm.patch \ file://binutils-x86_64_i386_biarch.patch \ + file://binutils-mips-pie.patch \ " # powerpc patches -- cgit v1.2.3