aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-02-27 09:35:24 +0000
committerKhem Raj <raj.khem@gmail.com>2015-02-27 09:35:24 +0000
commitcaca096c10984aacba2c24c2e999eb8d1e159ced (patch)
treed66345fc753166a2a4b58b16ae8c38868ac534f9
parente4e31890e377a45f43c111cd7f82a57dd5993d29 (diff)
downloadmeta-linaro-caca096c10984aacba2c24c2e999eb8d1e159ced.tar.gz
binutils-2.25: Fix gold crash seen when linking busybox
Change-Id: I49f989e100f360a167432a43c631b3939915cce1 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc1
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch36
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc
index 5925d121..912d59a3 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25.inc
@@ -29,6 +29,7 @@ SRC_URI = "\
file://replace_macros_with_static_inline.patch;apply=no \
file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch;apply=no \
file://0001-AArch64-Define-LP64-BE-linker-name.patch \
+ file://0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
"
SRC_URI[md5sum] = "5c4b97c60f8bf624a34e2acef3138eec"
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
new file mode 100644
index 00000000..a47faef3
--- /dev/null
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.25/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
@@ -0,0 +1,36 @@
+From 54583eb23233b5369372ae41768655693d0584ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 27 Feb 2015 09:05:49 +0000
+Subject: [PATCH] Fix an internal error in do_print_to_mapfile seen with gold
+ on arm
+
+This is due to missing implementation of do_print_to_mapfile for
+atrributea section (ARM.attributes), it started to show up after fix
+for PR gold/16980 was installed
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Submitted
+---
+ gold/ChangeLog | 5 +++++
+ gold/attributes.h | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/gold/attributes.h b/gold/attributes.h
+index c0b171f..6e3ab8c 100644
+--- a/gold/attributes.h
++++ b/gold/attributes.h
+@@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data
+ { }
+
+ protected:
++ // Write to a map file.
++ void
++ do_print_to_mapfile(Mapfile* mapfile) const
++ { mapfile->print_output_data(this, _("** attributes")); }
+ // Write the data to the output file.
+ void
+ do_write(Output_file*);
+--
+2.1.4
+