summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-03-25 18:51:14 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-03-25 18:51:22 +0100
commit1279a32b8f92fe49e56bdb0e6601e223147da06d (patch)
tree1ec0f573658a60a91432f0f14095be4e8aa47acc
parent3bc381008bebdf4f816f9a5573ad2edfe527620d (diff)
bfin: add binutils bugfix from Bug report 17334
-rw-r--r--toolchain/binutils/patches/2.26/bfin.patch16
-rw-r--r--toolchain/binutils/patches/git/bfin.patch13
2 files changed, 21 insertions, 8 deletions
diff --git a/toolchain/binutils/patches/2.26/bfin.patch b/toolchain/binutils/patches/2.26/bfin.patch
index 09fe05a9d..1f287518a 100644
--- a/toolchain/binutils/patches/2.26/bfin.patch
+++ b/toolchain/binutils/patches/2.26/bfin.patch
@@ -1,13 +1,13 @@
-diff -Nur binutils-2.26.orig/bfd/elf32-bfin.c binutils-2.26/bfd/elf32-bfin.c
---- binutils-2.26.orig/bfd/elf32-bfin.c 2015-11-13 09:27:40.000000000 +0100
-+++ binutils-2.26/bfd/elf32-bfin.c 2016-02-08 01:14:15.360648022 +0100
-@@ -4456,9 +4456,6 @@
-
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index 7cc8b6d..12f0add 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4457,7 +4457,7 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
if (bfinfdpic_got_section (info))
{
-- BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
+ BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
- == (bfinfdpic_gotrel_section (info)->reloc_count
-- * sizeof (Elf32_External_Rel)));
++ >= (bfinfdpic_gotrel_section (info)->reloc_count
+ * sizeof (Elf32_External_Rel)));
if (bfinfdpic_gotfixup_section (info))
- {
diff --git a/toolchain/binutils/patches/git/bfin.patch b/toolchain/binutils/patches/git/bfin.patch
new file mode 100644
index 000000000..1f287518a
--- /dev/null
+++ b/toolchain/binutils/patches/git/bfin.patch
@@ -0,0 +1,13 @@
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index 7cc8b6d..12f0add 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4457,7 +4457,7 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
+ if (bfinfdpic_got_section (info))
+ {
+ BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
+- == (bfinfdpic_gotrel_section (info)->reloc_count
++ >= (bfinfdpic_gotrel_section (info)->reloc_count
+ * sizeof (Elf32_External_Rel)));
+
+ if (bfinfdpic_gotfixup_section (info))