summaryrefslogtreecommitdiff
path: root/recipes/binutils
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@bolloretelecom.eu>2009-12-28 23:12:15 +0100
committerJeremy Lainé <jeremy.laine@bolloretelecom.eu>2009-12-28 23:12:15 +0100
commit724e52892aa9ae7b78943128fba50362bbb26e52 (patch)
treeedf23a841e8196d5fba4be3a4186c4548d3500e1 /recipes/binutils
parentb9368e612020a4f11e4abbab78da967c0e409058 (diff)
binutils-2.18: fix ld segfault when building Qt 4.6.0 on powerpc
Diffstat (limited to 'recipes/binutils')
-rw-r--r--recipes/binutils/binutils-2.18/binutils-powerpc-ld-segfault.patch13
-rw-r--r--recipes/binutils/binutils_2.18.bb7
2 files changed, 18 insertions, 2 deletions
diff --git a/recipes/binutils/binutils-2.18/binutils-powerpc-ld-segfault.patch b/recipes/binutils/binutils-2.18/binutils-powerpc-ld-segfault.patch
new file mode 100644
index 0000000000..7356509761
--- /dev/null
+++ b/recipes/binutils/binutils-2.18/binutils-powerpc-ld-segfault.patch
@@ -0,0 +1,13 @@
+Index: binutils-2.18/bfd/elf32-ppc.c
+===================================================================
+--- binutils-2.18.orig/bfd/elf32-ppc.c 2007-08-06 21:59:29.000000000 +0200
++++ binutils-2.18/bfd/elf32-ppc.c 2009-12-28 22:36:41.000000000 +0100
+@@ -3968,7 +3968,7 @@
+ {
+ bfd_vma addend = r_type == R_PPC_PLTREL24 ? rel->r_addend : 0;
+ struct plt_entry *ent = find_plt_ent (h, got2, addend);
+- if (ent->plt.refcount > 0)
++ if (ent != NULL && ent->plt.refcount > 0)
+ ent->plt.refcount -= 1;
+ }
+ break;
diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb
index b1ae402e29..803e987d8f 100644
--- a/recipes/binutils/binutils_2.18.bb
+++ b/recipes/binutils/binutils_2.18.bb
@@ -1,5 +1,5 @@
INC_PR = "r8"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
require binutils.inc
LICENSE = "GPLv3"
@@ -20,7 +20,10 @@ SRC_URI = "\
"
# powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "\
+ file://binutils-2.16.1-e300c2c3.patch;patch=1 \
+ file://binutils-powerpc-ld-segfault.patch;patch=1 \
+ "
# ep93xx crunch patches
SRC_URI_append_ep9312 = " file://binutils-crunch.patch;patch=1"