From db64f4110c08902cc76e12e7b4a844776b635760 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 9 Jun 2012 09:42:59 -0700 Subject: [PATCH] binutils_2.22: Backport to fix bogus textrels This is reported by prelinker which does not go well with textrels. (From OE-Core rev: 7b1caeca8e5c0dd066bb940fe6d2dff4d22bf816) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../binutils/binutils/0001-PR-ld-13470.patch | 82 ++++++++++++++++++++++ meta/recipes-devtools/binutils/binutils_2.22.bb | 3 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch diff --git a/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch b/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch new file mode 100644 index 0000000..0a0e064 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch @@ -0,0 +1,82 @@ +From 82fdddd1c4e37881db9b4c6a944261521c6f10ac Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Sat, 3 Dec 2011 00:57:59 +0000 +Subject: [PATCH] PR ld/13470 * elf32-ppc.c + (ppc_elf_copy_indirect_symbol): Revert substantive + change in 2011-07-01 commit. Comment. * + elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise. + +--- + bfd/ChangeLog | 7 +++++++ + bfd/elf32-ppc.c | 14 ++++++++++---- + bfd/elf64-ppc.c | 14 ++++++++++---- + 3 files changed, 27 insertions(+), 8 deletions(-) + + +Upstream-Status: Backport + +Signed-off-by: Khem Raj +Index: binutils-2.22/bfd/elf32-ppc.c +=================================================================== +--- binutils-2.22.orig/bfd/elf32-ppc.c 2011-11-21 01:29:21.000000000 -0800 ++++ binutils-2.22/bfd/elf32-ppc.c 2012-05-31 14:28:48.273784929 -0700 +@@ -2987,10 +2987,6 @@ + edir->elf.needs_plt |= eind->elf.needs_plt; + edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed; + +- /* If we were called to copy over info for a weak sym, that's all. */ +- if (eind->elf.root.type != bfd_link_hash_indirect) +- return; +- + if (eind->dyn_relocs != NULL) + { + if (edir->dyn_relocs != NULL) +@@ -3022,6 +3018,16 @@ + eind->dyn_relocs = NULL; + } + ++ /* If we were called to copy over info for a weak sym, that's all. ++ You might think dyn_relocs need not be copied over; After all, ++ both syms will be dynamic or both non-dynamic so we're just ++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS ++ code in ppc_elf_adjust_dynamic_symbol needs to check for ++ dyn_relocs in read-only sections, and it does so on what is the ++ DIR sym here. */ ++ if (eind->elf.root.type != bfd_link_hash_indirect) ++ return; ++ + /* Copy over the GOT refcount entries that we may have already seen to + the symbol which just became indirect. */ + edir->elf.got.refcount += eind->elf.got.refcount; +Index: binutils-2.22/bfd/elf64-ppc.c +=================================================================== +--- binutils-2.22.orig/bfd/elf64-ppc.c 2011-11-21 01:29:24.000000000 -0800 ++++ binutils-2.22/bfd/elf64-ppc.c 2012-05-31 14:28:48.285784951 -0700 +@@ -4435,10 +4435,6 @@ + edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; + edir->elf.needs_plt |= eind->elf.needs_plt; + +- /* If we were called to copy over info for a weak sym, that's all. */ +- if (eind->elf.root.type != bfd_link_hash_indirect) +- return; +- + /* Copy over any dynamic relocs we may have on the indirect sym. */ + if (eind->dyn_relocs != NULL) + { +@@ -4471,6 +4467,16 @@ + eind->dyn_relocs = NULL; + } + ++ /* If we were called to copy over info for a weak sym, that's all. ++ You might think dyn_relocs need not be copied over; After all, ++ both syms will be dynamic or both non-dynamic so we're just ++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS ++ code in ppc64_elf_adjust_dynamic_symbol needs to check for ++ dyn_relocs in read-only sections, and it does so on what is the ++ DIR sym here. */ ++ if (eind->elf.root.type != bfd_link_hash_indirect) ++ return; ++ + /* Copy over got entries that we may have already seen to the + symbol which just became indirect. */ + if (eind->elf.got.glist != NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb index 9f62883..7b6adef 100644 --- a/meta/recipes-devtools/binutils/binutils_2.22.bb +++ b/meta/recipes-devtools/binutils/binutils_2.22.bb @@ -1,6 +1,6 @@ require binutils.inc -PR = "r8" +PR = "r9" LIC_FILES_CHKSUM="\ file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ @@ -32,6 +32,7 @@ SRC_URI = "\ file://binutils-powerpc-e5500.patch \ file://binutils-armv5e.patch \ file://mips64-default-ld-emulation.patch \ + file://0001-PR-ld-13470.patch \ " SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5" -- 2.7.4