summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-01 10:09:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:10 +0100
commit1cb175fd7b9b1b954ccbc71f45fd968069c76b2a (patch)
treee3158c741ca47906e41dee3c8342ff5f3b0a7c3c
parent2be79f0b1d0d53b8750d28013543b7ee853c1b42 (diff)
downloadpoky-1cb175fd7b9b1b954ccbc71f45fd968069c76b2a.tar.gz
binutils: Fix ICE in gold
Found when linking busybox using gold linker Change-Id: I47b89998b9cb3d75ac97113a1b0fba109483b198 (From OE-Core rev: f370b72a0d5e13bd4f53daea99f0851517b361a2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.25.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch36
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.25.inc b/meta/recipes-devtools/binutils/binutils-2.25.inc
index d69b519542..d9075b61f4 100644
--- a/meta/recipes-devtools/binutils/binutils-2.25.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.25.inc
@@ -24,6 +24,7 @@ SRC_URI = "\
24 file://binutils-armv5e.patch \ 24 file://binutils-armv5e.patch \
25 file://mips64-default-ld-emulation.patch \ 25 file://mips64-default-ld-emulation.patch \
26 file://binutils-xlp-support.patch \ 26 file://binutils-xlp-support.patch \
27 file://0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
27 " 28 "
28SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66" 29SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66"
29SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923" 30SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923"
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
new file mode 100644
index 0000000000..a47faef352
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
@@ -0,0 +1,36 @@
1From 54583eb23233b5369372ae41768655693d0584ef Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 27 Feb 2015 09:05:49 +0000
4Subject: [PATCH] Fix an internal error in do_print_to_mapfile seen with gold
5 on arm
6
7This is due to missing implementation of do_print_to_mapfile for
8atrributea section (ARM.attributes), it started to show up after fix
9for PR gold/16980 was installed
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13Upstream-Status: Submitted
14---
15 gold/ChangeLog | 5 +++++
16 gold/attributes.h | 4 ++++
17 2 files changed, 9 insertions(+)
18
19diff --git a/gold/attributes.h b/gold/attributes.h
20index c0b171f..6e3ab8c 100644
21--- a/gold/attributes.h
22+++ b/gold/attributes.h
23@@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data
24 { }
25
26 protected:
27+ // Write to a map file.
28+ void
29+ do_print_to_mapfile(Mapfile* mapfile) const
30+ { mapfile->print_output_data(this, _("** attributes")); }
31 // Write the data to the output file.
32 void
33 do_write(Output_file*);
34--
352.1.4
36