commit: 949d5c865398a24fe5c1d956bf91754d24593203 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 20 23:29:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 20 23:29:55 2025 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=949d5c86
9999: drop patch merged upstream Signed-off-by: Sam James <sam <AT> gentoo.org> ...ntsize-when-clearing-SEC_MERGE-SEC_STRING.patch | 87 ---------------------- 1 file changed, 87 deletions(-) diff --git a/9999/0006-elf-Clear-entsize-when-clearing-SEC_MERGE-SEC_STRING.patch b/9999/0006-elf-Clear-entsize-when-clearing-SEC_MERGE-SEC_STRING.patch deleted file mode 100644 index b9c30be..0000000 --- a/9999/0006-elf-Clear-entsize-when-clearing-SEC_MERGE-SEC_STRING.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 3e39ade99e4e24f741c7d5631412e89d1bc5bde4 Mon Sep 17 00:00:00 2001 -Message-ID: <3e39ade99e4e24f741c7d5631412e89d1bc5bde4.1755728184.git....@gentoo.org> -From: "H.J. Lu" <[email protected]> -Date: Wed, 20 Aug 2025 12:27:53 -0700 -Subject: [PATCH] elf: Clear entsize when clearing SEC_MERGE|SEC_STRINGS - -When generating an output from input SEC_MERGE|SEC_STRINGS sections with -different entsize, we clear the SEC_MERGE|SEC_STRINGS bits. We also need -to clear entsize. - - PR ld/33291 - * ldlang.c (lang_add_section): Clearing entsize when clearing - SEC_MERGE|SEC_STRINGS. - * testsuite/ld-elf/pr33291.d: New file. - * testsuite/ld-elf/pr33291a.s: Likewise. - * testsuite/ld-elf/pr33291b.s: Likewise. - -Signed-off-by: H.J. Lu <[email protected]> ---- - ld/ldlang.c | 1 + - ld/testsuite/ld-elf/pr33291.d | 9 +++++++++ - ld/testsuite/ld-elf/pr33291a.s | 8 ++++++++ - ld/testsuite/ld-elf/pr33291b.s | 7 +++++++ - 4 files changed, 25 insertions(+) - create mode 100644 ld/testsuite/ld-elf/pr33291.d - create mode 100644 ld/testsuite/ld-elf/pr33291a.s - create mode 100644 ld/testsuite/ld-elf/pr33291b.s - -diff --git a/ld/ldlang.c b/ld/ldlang.c -index 8ba95b04e23..0bb4a17df19 100644 ---- a/ld/ldlang.c -+++ b/ld/ldlang.c -@@ -2861,6 +2861,7 @@ lang_add_section (lang_statement_list_type *ptr, - && output->bfd_section->entsize != section->entsize)) - { - output->bfd_section->flags &= ~ (SEC_MERGE | SEC_STRINGS); -+ output->bfd_section->entsize = 0; - flags &= ~ (SEC_MERGE | SEC_STRINGS); - } - } -diff --git a/ld/testsuite/ld-elf/pr33291.d b/ld/testsuite/ld-elf/pr33291.d -new file mode 100644 -index 00000000000..9f08118433e ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr33291.d -@@ -0,0 +1,9 @@ -+#source: pr33291a.s -+#source: pr33291b.s -+#ld: -shared -+#readelf: -S --wide -+#xfail: ![check_shared_lib_support] -+ -+#... -+ \[[ 0-9]+\] \.rodata[ ]+PROGBITS[ ]+[0-9a-f]+ [0-9a-f]+ 0+9 00 +A +0 +0 +8 -+#... -diff --git a/ld/testsuite/ld-elf/pr33291a.s b/ld/testsuite/ld-elf/pr33291a.s -new file mode 100644 -index 00000000000..07e9f7c2c21 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr33291a.s -@@ -0,0 +1,8 @@ -+ .globl foo -+ .section .rodata.cst8,"aM",%progbits,8 -+ .align 8 -+ .type foo, %object -+ .size foo, 8 -+foo: -+ .quad 131073 -+ .section .note.GNU-stack,"",%progbits -diff --git a/ld/testsuite/ld-elf/pr33291b.s b/ld/testsuite/ld-elf/pr33291b.s -new file mode 100644 -index 00000000000..69f6b3db594 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr33291b.s -@@ -0,0 +1,7 @@ -+ .globl bar -+ .section .rodata.cst1,"aM",%progbits,1 -+ .type bar, %object -+ .size bar, 1 -+bar: -+ .byte 1 -+ .section .note.GNU-stack,"",%progbits - -base-commit: fbcdc06c238be4fd6da7fb9bff4dd4c7f749ae07 --- -2.51.0 -
