Skip to contentSkip to conversation

package/binutils: fix assertion failure in xtensa ld

PATCH New Max Filippov 2 participants 3 messages Mar 6, 2020 – Mar 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/binutils: fix assertion failure in xtensa ld

xtensa ld fails with the following message

ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at elf32-xtensa.c:3283 in elf_xtensa_finish_dynamic_sections

during domoticz package build. It happens because of mismatch between the size allocated for dynamic relocations in the executable image and the number of PLT relocations actually written to the image. The mismatch is caused by the fact that undefined weak symbol is treated as dynamic (and thus needing PLT relocation), but xtensa linker not expecting that.

Backported from: e15a8da9c71336b06cb5f2706c3f6b7e6ddd95a3

---
 .../0018-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 .../0007-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 .../0004-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch
 create mode 100644 package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch
 create mode 100644 package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch
package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch new file +37 -0
new file mode 100644
index 000000000000..f499426b708c
@@ -0,0 +1,37 @@
+From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001
+From: Max Filippov <[email protected]>
+Date: Wed, 4 Mar 2020 14:54:27 -0800
+Subject: [PATCH] bfd: xtensa: fix PR ld/25630
+
+bfd/
+2020-03-05  Max Filippov  <[email protected]>
+
+	* elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic
+	relocation sections for any removed reference to a dynamic symbol.
+
+Signed-off-by: Max Filippov <[email protected]>
+---
+ bfd/elf32-xtensa.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 12ff9f772aaf..65e14d87940c 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info,
+ 
+   if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT)
+       && (input_section->flags & SEC_ALLOC) != 0
+-      && (dynamic_symbol || bfd_link_pic (info))
+-      && (!h || h->root.type != bfd_link_hash_undefweak
+-	  || (dynamic_symbol
+-	      && (bfd_link_dll (info) || info->export_dynamic))))
++      && (dynamic_symbol
++	  || (bfd_link_pic (info)
++	      && (!h || h->root.type != bfd_link_hash_undefweak))))
+     {
+       asection *srel;
+       bfd_boolean is_plt = FALSE;
+-- 
+2.20.1
+
package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch new file +37 -0
new file mode 100644
index 000000000000..f499426b708c
@@ -0,0 +1,37 @@
+From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001
+From: Max Filippov <[email protected]>
+Date: Wed, 4 Mar 2020 14:54:27 -0800
+Subject: [PATCH] bfd: xtensa: fix PR ld/25630
+
+bfd/
+2020-03-05  Max Filippov  <[email protected]>
+
+	* elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic
+	relocation sections for any removed reference to a dynamic symbol.
+
+Signed-off-by: Max Filippov <[email protected]>
+---
+ bfd/elf32-xtensa.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 12ff9f772aaf..65e14d87940c 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info,
+ 
+   if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT)
+       && (input_section->flags & SEC_ALLOC) != 0
+-      && (dynamic_symbol || bfd_link_pic (info))
+-      && (!h || h->root.type != bfd_link_hash_undefweak
+-	  || (dynamic_symbol
+-	      && (bfd_link_dll (info) || info->export_dynamic))))
++      && (dynamic_symbol
++	  || (bfd_link_pic (info)
++	      && (!h || h->root.type != bfd_link_hash_undefweak))))
+     {
+       asection *srel;
+       bfd_boolean is_plt = FALSE;
+-- 
+2.20.1
+
package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch new file +37 -0
new file mode 100644
index 000000000000..f499426b708c
@@ -0,0 +1,37 @@
+From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001
+From: Max Filippov <[email protected]>
+Date: Wed, 4 Mar 2020 14:54:27 -0800
+Subject: [PATCH] bfd: xtensa: fix PR ld/25630
+
+bfd/
+2020-03-05  Max Filippov  <[email protected]>
+
+	* elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic
+	relocation sections for any removed reference to a dynamic symbol.
+
+Signed-off-by: Max Filippov <[email protected]>
+---
+ bfd/elf32-xtensa.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 12ff9f772aaf..65e14d87940c 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info,
+ 
+   if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT)
+       && (input_section->flags & SEC_ALLOC) != 0
+-      && (dynamic_symbol || bfd_link_pic (info))
+-      && (!h || h->root.type != bfd_link_hash_undefweak
+-	  || (dynamic_symbol
+-	      && (bfd_link_dll (info) || info->export_dynamic))))
++      && (dynamic_symbol
++	  || (bfd_link_pic (info)
++	      && (!h || h->root.type != bfd_link_hash_undefweak))))
+     {
+       asection *srel;
+       bfd_boolean is_plt = FALSE;
+-- 
+2.20.1
+
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/binutils: fix assertion failure in xtensa ld

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Max" == Max Filippov <[email protected]> writes:

xtensa ld fails with the following message
ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at elf32-xtensa.c:3283 in elf_xtensa_finish_dynamic_sections

during domoticz package build. It happens because of mismatch between the size allocated for dynamic relocations in the executable image and the number of PLT relocations actually written to the image. The mismatch is caused by the fact that undefined weak symbol is treated as dynamic (and thus needing PLT relocation), but xtensa linker not expecting that.

Quoted 3 lines

Backported from: e15a8da9c71336b06cb5f2706c3f6b7e6ddd95a3

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/binutils: fix assertion failure in xtensa ld

In reply to Max Filippov
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Max" == Max Filippov <[email protected]> writes:

xtensa ld fails with the following message
ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at elf32-xtensa.c:3283 in elf_xtensa_finish_dynamic_sections

during domoticz package build. It happens because of mismatch between the size allocated for dynamic relocations in the executable image and the number of PLT relocations actually written to the image. The mismatch is caused by the fact that undefined weak symbol is treated as dynamic (and thus needing PLT relocation), but xtensa linker not expecting that.

Backported from: e15a8da9c71336b06cb5f2706c3f6b7e6ddd95a3

Quoted 8 lines
---
 .../0018-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 .../0007-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 .../0004-bfd-xtensa-fix-PR-ld-25630.patch     | 37 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch
 create mode 100644 package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch
 create mode 100644 package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch

Committed (for the versions supported) to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard