diff --git a/binutils-2.27-branch.diff b/binutils-2.27-branch.diff index c319e3b..8fb9787 100644 --- a/binutils-2.27-branch.diff +++ b/binutils-2.27-branch.diff @@ -1,8 +1,46 @@ diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index 4f859c5..ef5e387 100644 +index 4f859c5..2eb6f2a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog -@@ -1,3 +1,42 @@ +@@ -1,3 +1,80 @@ ++2016-10-31 Alan Modra ++ ++ PR 20748 ++ * elf32-microblaze.c (microblaze_elf_finish_dynamic_sections): Revert ++ 2016-05-13 change. ++ ++2016-10-10 Christophe Lyon ++ Backport from mainline ++ 2016-09-28 Christophe Lyon ++ ++ PR ld/20608 ++ * elf32-arm.c (arm_type_of_stub): Handle the case when the pre-PLT ++ Thumb-ARM stub is too far. ++ ++2016-09-06 Senthil Kumar Selvaraj ++ ++ Backport from mainline ++ 2016-09-02 Senthil Kumar Selvaraj ++ ++ PR ld/20545 ++ * elf32-avr.c (elf32_avr_relax_delete_bytes): Add parameter ++ delete_shrinks_insn. Modify computation of shrinked_insn_address. ++ Compute shrink_boundary and adjust addend only if ++ addend_within_shrink_boundary. ++ (elf32_avr_relax_section): Modify calls to ++ elf32_avr_relax_delete_bytes to pass extra parameter. ++ ++2016-09-01 Alan Modra ++ ++ * elf64-ppc.c (synthetic_opd): New static var. ++ (compare_symbols): Don't treat symbols in .opd specially for ELFv2. ++ (ppc64_elf_get_synthetic_symtab): Likewise. Comment. ++ ++2016-08-30 Alan Modra ++ ++ PR 20531 ++ * elf32-ppc.c (_bfd_elf_ppc_set_arch): Add missing "break". ++ +2016-08-19 Alan Modra + + PR 20472 @@ -141,6 +179,221 @@ index 5d00fa0..85dae6b 100644 # Controls whether to enable development-mode features by default. -development=false +development=true +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 3d4a458..700bec3 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -3877,17 +3877,43 @@ arm_type_of_stub (struct bfd_link_info *info, + /* Note when dealing with PLT entries: the main PLT stub is in + ARM mode, so if the branch is in Thumb mode, another + Thumb->ARM stub will be inserted later just before the ARM +- PLT stub. We don't take this extra distance into account +- here, because if a long branch stub is needed, we'll add a +- Thumb->Arm one and branch directly to the ARM PLT entry +- because it avoids spreading offset corrections in several +- places. */ ++ PLT stub. If a long branch stub is needed, we'll add a ++ Thumb->Arm one and branch directly to the ARM PLT entry. ++ Here, we have to check if a pre-PLT Thumb->ARM stub ++ is needed and if it will be close enough. */ + + destination = (splt->output_section->vma + + splt->output_offset + + root_plt->offset); + st_type = STT_FUNC; +- branch_type = ST_BRANCH_TO_ARM; ++ ++ /* Thumb branch/call to PLT: it can become a branch to ARM ++ or to Thumb. We must perform the same checks and ++ corrections as in elf32_arm_final_link_relocate. */ ++ if ((r_type == R_ARM_THM_CALL) ++ || (r_type == R_ARM_THM_JUMP24)) ++ { ++ if (globals->use_blx ++ && r_type == R_ARM_THM_CALL ++ && !thumb_only) ++ { ++ /* If the Thumb BLX instruction is available, convert ++ the BL to a BLX instruction to call the ARM-mode ++ PLT entry. */ ++ branch_type = ST_BRANCH_TO_ARM; ++ } ++ else ++ { ++ if (!thumb_only) ++ /* Target the Thumb stub before the ARM PLT entry. */ ++ destination -= PLT_THUMB_STUB_SIZE; ++ branch_type = ST_BRANCH_TO_THUMB; ++ } ++ } ++ else ++ { ++ branch_type = ST_BRANCH_TO_ARM; ++ } + } + } + /* Calls to STT_GNU_IFUNC symbols should go through a PLT. */ +@@ -3923,6 +3949,15 @@ arm_type_of_stub (struct bfd_link_info *info, + || (r_type == R_ARM_THM_JUMP19)) + && !use_plt)) + { ++ /* If we need to insert a Thumb-Thumb long branch stub to a ++ PLT, use one that branches directly to the ARM PLT ++ stub. If we pretended we'd use the pre-PLT Thumb->ARM ++ stub, undo this now. */ ++ if ((branch_type == ST_BRANCH_TO_THUMB) && use_plt && !thumb_only) { ++ branch_type = ST_BRANCH_TO_ARM; ++ branch_offset += PLT_THUMB_STUB_SIZE; ++ } ++ + if (branch_type == ST_BRANCH_TO_THUMB) + { + /* Thumb to thumb. */ +diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c +index a0a5c69..eea76a4 100644 +--- a/bfd/elf32-avr.c ++++ b/bfd/elf32-avr.c +@@ -1808,13 +1808,17 @@ elf32_avr_adjust_diff_reloc_value (bfd *abfd, + /* Delete some bytes from a section while changing the size of an instruction. + The parameter "addr" denotes the section-relative offset pointing just + behind the shrinked instruction. "addr+count" point at the first +- byte just behind the original unshrinked instruction. */ ++ byte just behind the original unshrinked instruction. If delete_shrinks_insn ++ is FALSE, we are deleting redundant padding bytes from relax_info prop ++ record handling. In that case, addr is section-relative offset of start ++ of padding, and count is the number of padding bytes to delete. */ + + static bfd_boolean + elf32_avr_relax_delete_bytes (bfd *abfd, + asection *sec, + bfd_vma addr, +- int count) ++ int count, ++ bfd_boolean delete_shrinks_insn) + { + Elf_Internal_Shdr *symtab_hdr; + unsigned int sec_shndx; +@@ -1829,6 +1833,7 @@ elf32_avr_relax_delete_bytes (bfd *abfd, + struct avr_relax_info *relax_info; + struct avr_property_record *prop_record = NULL; + bfd_boolean did_shrink = FALSE; ++ bfd_boolean did_pad = FALSE; + + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; + sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec); +@@ -1909,6 +1914,7 @@ elf32_avr_relax_delete_bytes (bfd *abfd, + to remember we didn't delete anything i.e. don't set did_shrink, + so that we don't corrupt reloc offsets or symbol values.*/ + memset (contents + toaddr - count, fill, count); ++ did_pad = TRUE; + + /* Adjust the TOADDR to avoid moving symbols located at the address + of the property record, which has not moved. */ +@@ -1965,7 +1971,9 @@ elf32_avr_relax_delete_bytes (bfd *abfd, + continue; + + shrinked_insn_address = (sec->output_section->vma +- + sec->output_offset + addr - count); ++ + sec->output_offset + addr); ++ if (delete_shrinks_insn) ++ shrinked_insn_address -= count; + + irel = elf_section_data (isec)->relocs; + /* PR 12161: Read in the relocs for this section if necessary. */ +@@ -2002,6 +2010,13 @@ elf32_avr_relax_delete_bytes (bfd *abfd, + a symbol or section associated with it. */ + if (sym_sec == sec) + { ++ /* If there is an alignment boundary, we only need to ++ adjust addends that end up below the boundary. */ ++ bfd_vma shrink_boundary = (reloc_toaddr ++ + sec->output_section->vma ++ + sec->output_offset); ++ bfd_boolean addend_within_shrink_boundary = FALSE; ++ + symval += sym_sec->output_section->vma + + sym_sec->output_offset; + +@@ -2015,8 +2030,17 @@ elf32_avr_relax_delete_bytes (bfd *abfd, + (unsigned int) (symval + irel->r_addend), + (unsigned int) shrinked_insn_address); + ++ /* If we padded bytes, then the boundary didn't change, ++ so there's no need to adjust addends pointing at the boundary. ++ If we didn't pad, then we actually shrank the boundary, so ++ addends pointing at the boundary need to be adjusted too. */ ++ addend_within_shrink_boundary = did_pad ++ ? ((symval + irel->r_addend) < shrink_boundary) ++ : ((symval + irel->r_addend) <= shrink_boundary); ++ + if (symval <= shrinked_insn_address +- && (symval + irel->r_addend) > shrinked_insn_address) ++ && (symval + irel->r_addend) > shrinked_insn_address ++ && addend_within_shrink_boundary) + { + if (elf32_avr_is_diff_reloc (irel)) + { +@@ -2648,7 +2672,8 @@ elf32_avr_relax_section (bfd *abfd, + { + /* Delete two bytes of data. */ + if (!elf32_avr_relax_delete_bytes (abfd, sec, +- irel->r_offset + 2, 2)) ++ irel->r_offset + 2, 2, ++ TRUE)) + goto error_return; + + /* That will change things, so, we should relax again. +@@ -2972,7 +2997,8 @@ elf32_avr_relax_section (bfd *abfd, + + /* Delete two bytes of data. */ + if (!elf32_avr_relax_delete_bytes (abfd, sec, +- irel->r_offset + insn_size, 2)) ++ irel->r_offset + insn_size, 2, ++ TRUE)) + goto error_return; + + /* That will change things, so, we should relax +@@ -3040,7 +3066,7 @@ elf32_avr_relax_section (bfd *abfd, + record->offset -= count; + elf32_avr_relax_delete_bytes (abfd, sec, + addr - count, +- count); ++ count, FALSE); + *again = TRUE; + } + } +diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c +index 5496d16..d964e17 100644 +--- a/bfd/elf32-microblaze.c ++++ b/bfd/elf32-microblaze.c +@@ -3400,13 +3400,13 @@ microblaze_elf_finish_dynamic_sections (bfd *output_bfd, + { + asection *s; + +- s = bfd_get_linker_section (dynobj, name); ++ s = bfd_get_section_by_name (output_bfd, name); + if (s == NULL) + dyn.d_un.d_val = 0; + else + { + if (! size) +- dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; ++ dyn.d_un.d_ptr = s->vma; + else + dyn.d_un.d_val = s->size; + } +diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c +index 95ce1dc..e42ef1c 100644 +--- a/bfd/elf32-ppc.c ++++ b/bfd/elf32-ppc.c +@@ -2246,6 +2246,7 @@ _bfd_elf_ppc_set_arch (bfd *abfd) + case PPC_APUINFO_BRLOCK: + if (mach != bfd_mach_ppc_vle) + mach = bfd_mach_ppc_e500; ++ break; + + case PPC_APUINFO_VLE: + mach = bfd_mach_ppc_vle; diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 52a5fd1..5609b55 100644 --- a/bfd/elf32-sh.c @@ -171,10 +424,75 @@ index 52a5fd1..5609b55 100644 #define elf_backend_copy_indirect_symbol \ sh_elf_copy_indirect_symbol diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c -index d7af888..461bd5e 100644 +index d7af888..d236732 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c -@@ -5081,7 +5081,7 @@ ppc64_elf_before_check_relocs (bfd *ibfd, struct bfd_link_info *info) +@@ -3085,6 +3085,7 @@ get_opd_info (asection * sec) + + /* Parameters for the qsort hook. */ + static bfd_boolean synthetic_relocatable; ++static asection *synthetic_opd; + + /* qsort comparison function for ppc64_elf_get_synthetic_symtab. */ + +@@ -3101,12 +3102,15 @@ compare_symbols (const void *ap, const void *bp) + return 1; + + /* then .opd symbols. */ +- if (strcmp (a->section->name, ".opd") == 0 +- && strcmp (b->section->name, ".opd") != 0) +- return -1; +- if (strcmp (a->section->name, ".opd") != 0 +- && strcmp (b->section->name, ".opd") == 0) +- return 1; ++ if (synthetic_opd != NULL) ++ { ++ if (strcmp (a->section->name, ".opd") == 0 ++ && strcmp (b->section->name, ".opd") != 0) ++ return -1; ++ if (strcmp (a->section->name, ".opd") != 0 ++ && strcmp (b->section->name, ".opd") == 0) ++ return 1; ++ } + + /* then other code symbols. */ + if ((a->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL)) +@@ -3265,6 +3269,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abfd, + memcpy (syms, static_syms, (symcount + 1) * sizeof (*syms)); + + synthetic_relocatable = relocatable; ++ synthetic_opd = opd; + qsort (syms, symcount, sizeof (*syms), compare_symbols); + + if (!relocatable && symcount > 1) +@@ -3281,7 +3286,11 @@ ppc64_elf_get_synthetic_symtab (bfd *abfd, + } + + i = 0; +- if (strcmp (syms[i]->section->name, ".opd") == 0) ++ /* Note that here and in compare_symbols we can't compare opd and ++ sym->section directly. With separate debug info files, the ++ symbols will be extracted from the debug file while abfd passed ++ to this function is the real binary. */ ++ if (opd != NULL && strcmp (syms[i]->section->name, ".opd") == 0) + ++i; + codesecsym = i; + +@@ -3297,9 +3306,10 @@ ppc64_elf_get_synthetic_symtab (bfd *abfd, + break; + secsymend = i; + +- for (; i < symcount; ++i) +- if (strcmp (syms[i]->section->name, ".opd") != 0) +- break; ++ if (opd != NULL) ++ for (; i < symcount; ++i) ++ if (strcmp (syms[i]->section->name, ".opd") != 0) ++ break; + opdsymend = i; + + for (; i < symcount; ++i) +@@ -5081,7 +5091,7 @@ ppc64_elf_before_check_relocs (bfd *ibfd, struct bfd_link_info *info) { if (abiversion (ibfd) == 0) set_abiversion (ibfd, 1); @@ -183,7 +501,7 @@ index d7af888..461bd5e 100644 { info->callbacks->einfo (_("%P: %B .opd not allowed in ABI" " version %d\n"), -@@ -7102,7 +7102,8 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED, +@@ -7102,7 +7112,8 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED, return TRUE; } @@ -193,7 +511,7 @@ index d7af888..461bd5e 100644 static bfd_boolean readonly_dynrelocs (struct elf_link_hash_entry *h) -@@ -7121,6 +7122,27 @@ readonly_dynrelocs (struct elf_link_hash_entry *h) +@@ -7121,6 +7132,27 @@ readonly_dynrelocs (struct elf_link_hash_entry *h) return FALSE; } @@ -221,7 +539,7 @@ index d7af888..461bd5e 100644 /* Adjust a symbol defined by a dynamic object and referenced by a regular object. The current definition is in some section of the dynamic object, but we're not including those sections. We have to -@@ -7160,35 +7182,25 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, +@@ -7160,35 +7192,25 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, h->needs_plt = 0; h->pointer_equality_needed = 0; } @@ -266,7 +584,7 @@ index d7af888..461bd5e 100644 /* If making a plt entry, then we don't need copy relocs. */ return TRUE; } -@@ -7223,29 +7235,20 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, +@@ -7223,29 +7245,20 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, return TRUE; /* Don't generate a copy reloc for symbols defined in the executable. */ @@ -307,7 +625,7 @@ index d7af888..461bd5e 100644 { h->non_got_ref = 0; return TRUE; -@@ -9547,7 +9550,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) +@@ -9547,7 +9560,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) struct ppc_link_hash_table *htab; asection *s; struct ppc_link_hash_entry *eh; @@ -315,7 +633,7 @@ index d7af888..461bd5e 100644 struct got_entry **pgent, *gent; if (h->root.type == bfd_link_hash_indirect) -@@ -9627,10 +9629,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) +@@ -9627,10 +9639,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) allocate_got (h, info, gent); } @@ -333,7 +651,7 @@ index d7af888..461bd5e 100644 /* In the shared -Bsymbolic case, discard space allocated for dynamic pc-relative relocs against symbols which turn out to be defined in regular objects. For the normal shared case, -@@ -9648,8 +9654,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) +@@ -9648,8 +9664,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) avoid writing weird assembly. */ if (SYMBOL_CALLS_LOCAL (info, h)) { @@ -342,7 +660,7 @@ index d7af888..461bd5e 100644 for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) { p->count -= p->pc_count; -@@ -9681,36 +9685,47 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) +@@ -9681,36 +9695,47 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) } else if (h->type == STT_GNU_IFUNC) { @@ -412,7 +730,7 @@ index d7af888..461bd5e 100644 } /* Finally, allocate space. */ -@@ -9827,6 +9842,7 @@ size_global_entry_stubs (struct elf_link_hash_entry *h, void *inf) +@@ -9827,6 +9852,7 @@ size_global_entry_stubs (struct elf_link_hash_entry *h, void *inf) need to define the symbol in the executable on a call stub. This is to avoid text relocations. */ s->size = (s->size + 15) & -16; @@ -420,7 +738,7 @@ index d7af888..461bd5e 100644 h->root.u.def.section = s; h->root.u.def.value = s->size; s->size += 16; -@@ -14679,22 +14695,25 @@ ppc64_elf_relocate_section (bfd *output_bfd, +@@ -14679,22 +14705,25 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (NO_OPD_RELOCS && is_opd) break; @@ -463,12 +781,12 @@ index d7af888..461bd5e 100644 bfd_boolean skip, relocate; asection *sreloc; diff --git a/bfd/version.h b/bfd/version.h -index 9ca8ab8..a2cf31e 100644 +index 9ca8ab8..b032cc5 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20160803 -+#define BFD_VERSION_DATE 20160824 ++#define BFD_VERSION_DATE 20161129 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ @@ -581,20 +899,56 @@ index ea013d1..6cbf17c 100755 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/gas/ChangeLog b/gas/ChangeLog -index 5553b6c..a39895a 100644 +index 5553b6c..50fcf52 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog -@@ -2,6 +2,10 @@ - - * configure: Regenerate. - +@@ -1,3 +1,31 @@ ++2016-09-16 Peter Bergner ++ ++ Apply from master. ++ 2016-09-14 Peter Bergner ++ ++ * testsuite/gas/ppc/power9.d New tests. ++ : Remove tests. ++ : Update tests. ++ * testsuite/gas/ppc/power9.s: Likewise. ++ ++2016-08-25 Thomas Preud'homme ++ ++ Backport from mainline ++ 2016-08-25 Thomas Preud'homme ++ ++ * config/tc-arm.c (v7m_psrs): Remove msp_s, MSP_S, psp_s and PSP_S ++ special registers. ++ * testsuite/gas/arm/archv8m-cmse-msr.s: Remove test for above special ++ registers. ++ * testsuite/gas/arm/archv8m-cmse-msr-base.d: Likewise. ++ * testsuite/gas/arm/archv8m-cmse-msr-main.d: Likewise. ++ * testsuite/gas/arm/archv8m-main-dsp-4.d: Likewise. ++ +2016-08-03 Tristan Gingold + + * configure: Regenerate. + - 2016-07-01 Tristan Gingold + 2016-08-03 Tristan Gingold * configure: Regenerate. +diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c +index 73d0531..4fa0bfc 100644 +--- a/gas/config/tc-arm.c ++++ b/gas/config/tc-arm.c +@@ -18788,8 +18788,8 @@ static const struct asm_psr v7m_psrs[] = + {"ipsr", 5 }, {"IPSR", 5 }, + {"epsr", 6 }, {"EPSR", 6 }, + {"iepsr", 7 }, {"IEPSR", 7 }, +- {"msp", 8 }, {"MSP", 8 }, {"msp_s", 8 }, {"MSP_S", 8 }, +- {"psp", 9 }, {"PSP", 9 }, {"psp_s", 9 }, {"PSP_S", 9 }, ++ {"msp", 8 }, {"MSP", 8 }, ++ {"psp", 9 }, {"PSP", 9 }, + {"primask", 16}, {"PRIMASK", 16}, + {"basepri", 17}, {"BASEPRI", 17}, + {"basepri_max", 18}, {"BASEPRI_MAX", 18}, diff --git a/gas/configure b/gas/configure index 7b48a58..f7753b8 100755 --- a/gas/configure @@ -681,11 +1035,314 @@ index 7b48a58..f7753b8 100755 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d +index 4bbb82d..0c46a44 100644 +--- a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d ++++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d +@@ -7,26 +7,18 @@ + + Disassembly of section .text: + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS +diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d +index 30a3361..42d3ba9 100644 +--- a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d ++++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d +@@ -7,26 +7,18 @@ + + Disassembly of section .text: + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS +diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr.s b/gas/testsuite/gas/arm/archv8m-cmse-msr.s +index 897be1a..66a3b64 100644 +--- a/gas/testsuite/gas/arm/archv8m-cmse-msr.s ++++ b/gas/testsuite/gas/arm/archv8m-cmse-msr.s +@@ -1,25 +1,17 @@ + T: + msr MSP, r0 +-msr MSP_S, r0 + msr MSP_NS, r0 + msr PSP, r0 +-msr PSP_S, r0 + msr PSP_NS, r0 + msr msp, r0 +-msr msp_s, r0 + msr msp_ns, r0 + msr psp, r0 +-msr psp_s, r0 + msr psp_ns, r0 + mrs r0, MSP +-mrs r0, MSP_S + mrs r0, MSP_NS + mrs r0, PSP +-mrs r0, PSP_S + mrs r0, PSP_NS + mrs r0, msp +-mrs r0, msp_s + mrs r0, msp_ns + mrs r0, psp +-mrs r0, psp_s + mrs r0, psp_ns +diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d +index 248f75e..7ebc9c1 100644 +--- a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d ++++ b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d +@@ -7,26 +7,18 @@ + + Disassembly of section .text: + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f380 8808 msr MSP, r0 +-0+.* <[^>]*> f380 8808 msr MSP, r0 + 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 + 0+.* <[^>]*> f380 8809 msr PSP, r0 +-0+.* <[^>]*> f380 8809 msr PSP, r0 + 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS + 0+.* <[^>]*> f3ef 8008 mrs r0, MSP +-0+.* <[^>]*> f3ef 8008 mrs r0, MSP + 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS + 0+.* <[^>]*> f3ef 8009 mrs r0, PSP +-0+.* <[^>]*> f3ef 8009 mrs r0, PSP + 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS +diff --git a/gas/testsuite/gas/ppc/power9.d b/gas/testsuite/gas/ppc/power9.d +index 1135d26..31e4530 100644 +--- a/gas/testsuite/gas/ppc/power9.d ++++ b/gas/testsuite/gas/ppc/power9.d +@@ -280,14 +280,6 @@ Disassembly of section \.text: + .*: (7f a8 49 80|80 49 a8 7f) cmprb cr7,1,r8,r9 + .*: (7d e0 01 00|00 01 e0 7d) setb r15,cr0 + .*: (7d fc 01 00|00 01 fc 7d) setb r15,cr7 +-.*: (7e 00 01 01|01 01 00 7e) setbool r16,lt +-.*: (7e 01 01 01|01 01 01 7e) setbool r16,gt +-.*: (7e 02 01 01|01 01 02 7e) setbool r16,eq +-.*: (7e 03 01 01|01 01 03 7e) setbool r16,so +-.*: (7e 1c 01 01|01 01 1c 7e) setbool r16,4\*cr7\+lt +-.*: (7e 1d 01 01|01 01 1d 7e) setbool r16,4\*cr7\+gt +-.*: (7e 1e 01 01|01 01 1e 7e) setbool r16,4\*cr7\+eq +-.*: (7e 1f 01 01|01 01 1f 7e) setbool r16,4\*cr7\+so + .*: (7f 40 52 1a|1a 52 40 7f) lxvl vs26,0,r10 + .*: (7f 14 52 1b|1b 52 14 7f) lxvl vs56,r20,r10 + .*: (7f 60 5b 1a|1a 5b 60 7f) stxvl vs27,0,r11 +@@ -331,6 +323,7 @@ Disassembly of section \.text: + .*: (4c e0 80 04|04 80 e0 4c) addpcis r7,-32768 + .*: (4c e0 80 04|04 80 e0 4c) addpcis r7,-32768 + .*: (7c 00 02 a4|a4 02 00 7c) slbsync ++.*: (7d 40 06 a4|a4 06 40 7d) slbiag r10 + .*: (7d 40 5b a4|a4 5b 40 7d) slbieg r10,r11 + .*: (7c 60 27 26|26 27 60 7c) slbmfee r3,r4 + .*: (7c 60 27 26|26 27 60 7c) slbmfee r3,r4 +@@ -344,14 +337,9 @@ Disassembly of section \.text: + .*: (7c 00 1a 24|24 1a 00 7c) tlbiel r3 + .*: (7c 00 1a 24|24 1a 00 7c) tlbiel r3 + .*: (7c 8f 1a 24|24 1a 8f 7c) tlbiel r3,r4,3,1,1 +-.*: (7c 0c 6e 0c|0c 6e 0c 7c) copy r12,r13 +-.*: (7c 2c 6e 0c|0c 6e 2c 7c) copy_first r12,r13 +-.*: (7c 2c 6e 0c|0c 6e 2c 7c) copy_first r12,r13 +-.*: (7c 0a 5f 0c|0c 5f 0a 7c) paste r10,r11 +-.*: (7c 0a 5f 0c|0c 5f 0a 7c) paste r10,r11 +-.*: (7c 2a 5f 0d|0d 5f 2a 7c) paste_last r10,r11 +-.*: (7c 2a 5f 0d|0d 5f 2a 7c) paste_last r10,r11 +-.*: (7c 00 06 8c|8c 06 00 7c) cp_abort ++.*: (7c 2c 6e 0c|0c 6e 2c 7c) copy r12,r13 ++.*: (7c 2a 5f 0d|0d 5f 2a 7c) paste\. r10,r11 ++.*: (7c 00 06 8c|8c 06 00 7c) cpabort + .*: (7c 00 04 ac|ac 04 00 7c) hwsync + .*: (7c 00 04 ac|ac 04 00 7c) hwsync + .*: (7c 00 04 ac|ac 04 00 7c) hwsync +@@ -359,8 +347,6 @@ Disassembly of section \.text: + .*: (7c 20 04 ac|ac 04 20 7c) lwsync + .*: (7c 40 04 ac|ac 04 40 7c) ptesync + .*: (7c 40 04 ac|ac 04 40 7c) ptesync +-.*: (7c 07 04 ac|ac 04 07 7c) sync 0,7 +-.*: (7c 28 04 ac|ac 04 28 7c) sync 1,8 + .*: (7e 80 04 cc|cc 04 80 7e) ldat r20,0,0 + .*: (7e 8a e4 cc|cc e4 8a 7e) ldat r20,r10,28 + .*: (7e a0 04 8c|8c 04 a0 7e) lwat r21,0,0 +@@ -373,8 +359,6 @@ Disassembly of section \.text: + .*: (7c 00 f6 e4|e4 f6 00 7c) rmieg r30 + .*: (7d 40 7a 6a|6a 7a 40 7d) ldmx r10,0,r15 + .*: (7d 43 7a 6a|6a 7a 43 7d) ldmx r10,r3,r15 +-.*: (7d 60 83 6a|6a 83 60 7d) lwzmx r11,0,r16 +-.*: (7d 63 83 6a|6a 83 63 7d) lwzmx r11,r3,r16 + .*: (4c 00 02 e4|e4 02 00 4c) stop + .*: (7c 00 00 3c|3c 00 00 7c) wait + .*: (7c 00 00 3c|3c 00 00 7c) wait +@@ -397,9 +381,6 @@ Disassembly of section \.text: + .*: (7d 6c 69 54|54 69 6c 7d) addex r11,r12,r13,0 + .*: (7d 6c 6b 54|54 6b 6c 7d) addex r11,r12,r13,1 + .*: (7d 6c 6d 54|54 6d 6c 7d) addex r11,r12,r13,2 +-.*: (7e b6 b9 55|55 b9 b6 7e) addex\. r21,r22,r23,0 +-.*: (7e b6 bb 55|55 bb b6 7e) addex\. r21,r22,r23,1 +-.*: (7e b6 bd 55|55 bd b6 7e) addex\. r21,r22,r23,2 + .*: (ff 20 04 8e|8e 04 20 ff) mffs f25 + .*: (ff 20 04 8f|8f 04 20 ff) mffs\. f25 + .*: (ff 41 04 8e|8e 04 41 ff) mffsce f26 +@@ -410,12 +391,4 @@ Disassembly of section \.text: + .*: (ff d7 04 8e|8e 04 d7 ff) mffscrni f30,0 + .*: (ff d7 1c 8e|8e 1c d7 ff) mffscrni f30,3 + .*: (ff f8 04 8e|8e 04 f8 ff) mffsl f31 +-.*: (7e 8a 01 76|76 01 8a 7e) brd r10,r20 +-.*: (7e ab 01 b6|b6 01 ab 7e) brh r11,r21 +-.*: (7e cc 01 36|36 01 cc 7e) brw r12,r22 +-.*: (11 6a 63 77|77 63 6a 11) nandxor r10,r11,r12,r13 +-.*: (12 b4 b5 f6|f6 b5 b4 12) xor3 r20,r21,r22,r23 +-.*: (11 6a 60 34|34 60 6a 11) rldixor r10,r11,0,r12 +-.*: (11 6a 66 f4|f4 66 6a 11) rldixor r10,r11,27,r12 +-.*: (11 6a 67 f5|f5 67 6a 11) rldixor r10,r11,63,r12 + #pass +diff --git a/gas/testsuite/gas/ppc/power9.s b/gas/testsuite/gas/ppc/power9.s +index 21edb9c..469435d 100644 +--- a/gas/testsuite/gas/ppc/power9.s ++++ b/gas/testsuite/gas/ppc/power9.s +@@ -271,14 +271,6 @@ power9: + cmprb 7,1,8,9 + setb 15,0 + setb 15,7 +- setbool 16,0 +- setbool 16,1 +- setbool 16,2 +- setbool 16,3 +- setbool 16,28 +- setbool 16,29 +- setbool 16,30 +- setbool 16,31 + lxvl 26,0,10 + lxvl 56,20,10 + stxvl 27,0,11 +@@ -322,6 +314,7 @@ power9: + addpcis 7,-0x8000 + subpcis 7,0x8000 + slbsync ++ slbiag 10 + slbieg 10,11 + slbmfee 3,4 + slbmfee 3,4,0 +@@ -335,23 +328,16 @@ power9: + tlbiel 3 + tlbiel 3,0,0,0,0 + tlbiel 3,4,3,1,1 +- copy 12,13,0 +- copy_first 12,13 +- copy 12,13,1 +- paste 10,11,0 +- paste 10,11 +- paste. 10,11,1 +- paste_last 10,11 +- cp_abort ++ copy 12,13 ++ paste. 10,11 ++ cpabort + hwsync + sync +- sync 0,0x0 ++ sync 0 + lwsync +- sync 1,0x0 ++ sync 1 + ptesync +- sync 2,0x0 +- sync 0,0x7 +- sync 1,0x8 ++ sync 2 + ldat 20,0,0x0 + ldat 20,10,0x1c + lwat 21,0,0x0 +@@ -364,8 +350,6 @@ power9: + rmieg 30 + ldmx 10,0,15 + ldmx 10,3,15 +- lwzmx 11,0,16 +- lwzmx 11,3,16 + stop + wait + wait 0 +@@ -388,9 +372,6 @@ power9: + addex 11,12,13,0 + addex 11,12,13,1 + addex 11,12,13,2 +- addex. 21,22,23,0 +- addex. 21,22,23,1 +- addex. 21,22,23,2 + mffs 25 + mffs. 25 + mffsce 26 +@@ -401,11 +382,3 @@ power9: + mffscrni 30,0 + mffscrni 30,3 + mffsl 31 +- brd 10,20 +- brh 11,21 +- brw 12,22 +- nandxor 10,11,12,13 +- xor3 20,21,22,23 +- rldixor 10,11,0,12 +- rldixor 10,11,27,12 +- rldixor 10,11,63,12 diff --git a/gold/ChangeLog b/gold/ChangeLog -index 239df36..7e69839 100644 +index 239df36..f5005ef 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog -@@ -1,6 +1,66 @@ +@@ -1,6 +1,72 @@ ++2016-09-26 Cary Coutant ++ ++ PR gold/20238 ++ * symtab.cc (Symbol_table::define_default_version): Check that ++ unversioned symbol is defined. ++ +2016-08-23 Roland McGrath + + * options.h (General_options): Grok -z stack-size. @@ -1177,10 +1834,18 @@ index dc4612d..8e66b77 100644 Reloc::rela32_13(view, got_offset, addend); break; diff --git a/gold/symtab.cc b/gold/symtab.cc -index 5ce5c31..b31794a 100644 +index 5ce5c31..c872f47 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc -@@ -1325,6 +1325,9 @@ Symbol_table::add_from_relobj( +@@ -882,6 +882,7 @@ Symbol_table::define_default_version(Sized_symbol* sym, + ; + else if (pdef->second->is_from_dynobj() + && sym->is_from_dynobj() ++ && pdef->second->is_defined() + && pdef->second->object() != sym->object()) + ; + else +@@ -1325,6 +1326,9 @@ Symbol_table::add_from_relobj( res = this->add_from_object(relobj, name, name_key, ver, ver_key, is_default_version, *psym, st_shndx, is_ordinary, orig_st_shndx); @@ -1190,7 +1855,7 @@ index 5ce5c31..b31794a 100644 if (is_forced_local) this->force_local(res); -@@ -1406,6 +1409,9 @@ Symbol_table::add_from_pluginobj( +@@ -1406,6 +1410,9 @@ Symbol_table::add_from_pluginobj( is_default_version, *sym, st_shndx, is_ordinary, st_shndx); @@ -1200,7 +1865,7 @@ index 5ce5c31..b31794a 100644 if (is_forced_local) this->force_local(res); -@@ -1602,6 +1608,9 @@ Symbol_table::add_from_dynobj( +@@ -1602,6 +1609,9 @@ Symbol_table::add_from_dynobj( } } @@ -1210,7 +1875,7 @@ index 5ce5c31..b31794a 100644 // Note that it is possible that RES was overridden by an // earlier object, in which case it can't be aliased here. if (st_shndx != elfcpp::SHN_UNDEF -@@ -1640,7 +1649,6 @@ Symbol_table::add_from_incrobj( +@@ -1640,7 +1650,6 @@ Symbol_table::add_from_incrobj( Stringpool::Key ver_key = 0; bool is_default_version = false; @@ -1218,7 +1883,7 @@ index 5ce5c31..b31794a 100644 Stringpool::Key name_key; name = this->namepool_.add(name, true, &name_key); -@@ -1650,9 +1658,6 @@ Symbol_table::add_from_incrobj( +@@ -1650,9 +1659,6 @@ Symbol_table::add_from_incrobj( is_default_version, *sym, st_shndx, is_ordinary, st_shndx); @@ -1443,10 +2108,37 @@ index 4c17248..bf3ecaa 100755 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/ld/ChangeLog b/ld/ChangeLog -index a57cd66..82c6344 100644 +index a57cd66..6cc35c7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog -@@ -1,3 +1,29 @@ +@@ -1,3 +1,56 @@ ++2016-10-14 Alan Modra ++ ++ * scripttempl/DWARF.sc: Add .debug_addr. ++ ++2016-10-10 Christophe Lyon ++ ++ Backport from mainline ++ 2016-09-28 Christophe Lyon ++ ++ PR ld/20608 ++ * testsuite/ld-arm/arm-elf.exp: Handle new testcase. ++ * testsuite/ld-arm/farcall-mixed-app2.d: New file. ++ * testsuite/ld-arm/farcall-mixed-app2.r: Likewise. ++ * testsuite/ld-arm/farcall-mixed-app2.s: Likewise. ++ * testsuite/ld-arm/farcall-mixed-app2.sym: Likewise. ++ ++2016-09-06 Senthil Kumar Selvaraj ++ ++ Backport from mainline ++ 2016-09-02 Senthil Kumar Selvaraj ++ ++ PR ld/20545 ++ * testsuite/ld-avr/avr-prop-7.d: New test. ++ * testsuite/ld-avr/avr-prop-7.s: New test. ++ * testsuite/ld-avr/avr-prop-8.d: New test. ++ * testsuite/ld-avr/avr-prop-8.s: New test. ++ +2016-08-09 Roland McGrath + + * emulparams/armelf.sh (GENERATE_PIE_SCRIPT): Set to yes. @@ -1668,19 +2360,353 @@ index 16f6508..f8ffc13 100644 +# PR 17739. Delay checking relocs until after all files have +# been opened and linker garbage collection has taken place. +CHECK_RELOCS_AFTER_OPEN_INPUT=yes +diff --git a/ld/scripttempl/DWARF.sc b/ld/scripttempl/DWARF.sc +index a8bcb97..cbb2999 100644 +--- a/ld/scripttempl/DWARF.sc ++++ b/ld/scripttempl/DWARF.sc +@@ -42,4 +42,5 @@ cat <: ++ .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) ++ .*: e59fe004 ldr lr, \[pc, #4\] ; .* ++ .*: e08fe00e add lr, pc, lr ++ .*: e5bef008 ldr pc, \[lr, #8\]! ++ .*: .* ++.* : ++ .*: 4778 bx pc ++ .*: 46c0 nop ; \(mov r8, r8\) ++ .*: e28fc6.* add ip, pc, #.* ++ .*: e28cca.* add ip, ip, #.* ; 0x.* ++ .*: e5bcf.* ldr pc, \[ip, #.*\]!.* ++.* : ++ .*: e28fc6.* add ip, pc, #.* ++ .*: e28cca.* add ip, ip, #.* ; 0x.* ++ .*: e5bcf.* ldr pc, \[ip, #.*\]!.* ++ ++Disassembly of section .text: ++ ++.* <_start>: ++ .*: e1a0c00d mov ip, sp ++ .*: e92dd800 push {fp, ip, lr, pc} ++ .*: eb000008 bl .* <__app_func_veneer> ++ .*: ebfffff6 bl .* ++ .*: ebfffff2 bl .* ++ .*: e89d6800 ldm sp, {fp, sp, lr} ++ .*: e12fff1e bx lr ++ .*: e1a00000 nop ; \(mov r0, r0\) ++ ++.* : ++ .*: b500 push {lr} ++ .*: f7ff efde blx 81e0 ++ .*: bd00 pop {pc} ++ .*: 4770 bx lr ++ .*: 46c0 nop ; \(mov r8, r8\) ++#... ++ ++.* <__app_func_veneer>: ++ .*: e51ff004 ldr pc, \[pc, #-4\] ; 8234 <__app_func_veneer\+0x4> ++ .*: 02100000 .word 0x02100000 ++ ++Disassembly of section .mid_thumb: ++ ++.* : ++#... ++ .*: f400 9000 b.w .* ++ .*: f000 b800 b.w .* <__lib_func2_from_thumb> ++ ++.* <__lib_func2_from_thumb>: ++ .*: 4778 bx pc ++ .*: 46c0 nop ; \(mov r8, r8\) ++ .*: e51ff004 ldr pc, \[pc, #-4\] ; 10081e8 <__lib_func2_from_thumb\+0x8> ++ .*: 000081e0 .word 0x000081e0 ++ .*: 00000000 .word 0x00000000 ++ ++Disassembly of section .far_arm: ++ ++.* : ++ .*: e1a0c00d mov ip, sp ++ .*: e92dd800 push {fp, ip, lr, pc} ++ .*: eb000006 bl .* <__lib_func1_veneer> ++ .*: eb000007 bl .* <__lib_func2_veneer> ++ .*: e89d6800 ldm sp, {fp, sp, lr} ++ .*: e12fff1e bx lr ++ .*: e1a00000 nop ; \(mov r0, r0\) ++ .*: e1a00000 nop ; \(mov r0, r0\) ++ ++.* : ++ .*: e12fff1e bx lr ++#... ++ ++.* <__lib_func1_veneer>: ++ .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func1_veneer\+0x4> ++ .*: 000081ec .word 0x000081ec ++.* <__lib_func2_veneer>: ++ .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func2_veneer\+0x4> ++ .*: 000081e0 .word 0x000081e0 ++ ++Disassembly of section .far_thumb: ++ ++.* : ++ .*: b500 push {lr} ++ .*: f000 e806 blx .* <__lib_func2_from_thumb> ++ .*: bd00 pop {pc} ++ .*: 4770 bx lr ++ .*: 46c0 nop ; \(mov r8, r8\) ++#... ++ ++.* <__lib_func2_from_thumb>: ++ .*: e51ff004 ldr pc, \[pc, #-4\] ; 2200014 <__lib_func2_from_thumb\+0x4> ++ .*: 000081e0 .word 0x000081e0 +diff --git a/ld/testsuite/ld-arm/farcall-mixed-app2.r b/ld/testsuite/ld-arm/farcall-mixed-app2.r +new file mode 100644 +index 0000000..910a361 +--- /dev/null ++++ b/ld/testsuite/ld-arm/farcall-mixed-app2.r +@@ -0,0 +1,10 @@ ++ ++tmpdir/farcall-mixed-app.*: file format elf32-(little|big)arm ++ ++DYNAMIC RELOCATION RECORDS ++OFFSET TYPE VALUE ++.* R_ARM_COPY data_obj ++.* R_ARM_JUMP_SLOT lib_func2 ++.* R_ARM_JUMP_SLOT lib_func1 ++ ++ +diff --git a/ld/testsuite/ld-arm/farcall-mixed-app2.s b/ld/testsuite/ld-arm/farcall-mixed-app2.s +new file mode 100644 +index 0000000..ee315e9 +--- /dev/null ++++ b/ld/testsuite/ld-arm/farcall-mixed-app2.s +@@ -0,0 +1,76 @@ ++ .text ++ .p2align 4 ++ .globl _start ++_start: ++ mov ip, sp ++ stmdb sp!, {r11, ip, lr, pc} ++ bl app_func ++ bl lib_func1 ++ bl lib_func2 ++ ldmia sp, {r11, sp, lr} ++ bx lr ++ ++ .p2align 4 ++ .globl app_tfunc_close ++ .type app_tfunc_close,%function ++ .thumb_func ++ .code 16 ++app_tfunc_close: ++ push {lr} ++ bl lib_func2 ++ pop {pc} ++ bx lr ++ ++@ We will place the section .mid_thumb at 0xFFFEF8. ++@ Just far enough for XXXX ++ .section .mid_thumb, "xa" ++ ++ .p2align 4 ++ .globl mid_tfunc ++ .type mid_tfunc,%function ++ .thumb_func ++ .code 16 ++mid_tfunc: ++ .syntax unified ++ .space 24 ++ b.w lib_func2 ++ b.w lib_func2 ++ ++@ We will place the section .far_arm at 0x2100000. ++ .section .far_arm, "xa" ++ ++ .arm ++ .p2align 4 ++ .globl app_func ++ .type app_func,%function ++app_func: ++ mov ip, sp ++ stmdb sp!, {r11, ip, lr, pc} ++ bl lib_func1 ++ bl lib_func2 ++ ldmia sp, {r11, sp, lr} ++ bx lr ++ ++ .arm ++ .p2align 4 ++ .globl app_func2 ++ .type app_func2,%function ++app_func2: ++ bx lr ++ ++@ We will place the section .far_thumb at 0x2200000. ++ .section .far_thumb, "xa" ++ ++ .p2align 4 ++ .globl app_tfunc ++ .type app_tfunc,%function ++ .thumb_func ++ .code 16 ++app_tfunc: ++ push {lr} ++ bl lib_func2 ++ pop {pc} ++ bx lr ++ ++ .data ++ .long data_obj +diff --git a/ld/testsuite/ld-arm/farcall-mixed-app2.sym b/ld/testsuite/ld-arm/farcall-mixed-app2.sym +new file mode 100644 +index 0000000..1d3bd1d +--- /dev/null ++++ b/ld/testsuite/ld-arm/farcall-mixed-app2.sym +@@ -0,0 +1,15 @@ ++ ++Symbol table for image: ++ +Num +Buc: +Value +Size +Type +Bind +Vis +Ndx +Name ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start__ ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 _end ++ +.. +..: ........ +4 +OBJECT +GLOBAL +DEFAULT +12 data_obj ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_end__ ++ +.. +..: 0*[^0]*.* +0 +FUNC +GLOBAL +DEFAULT +UND lib_func1 ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +11 __data_start ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 __end__ ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start ++ +.. +..: .......0 +0 +FUNC +GLOBAL +DEFAULT +15 app_func2 ++ +.. +..: 0*[^0]*.* +0 +FUNC +GLOBAL +DEFAULT +UND lib_func2 ++ +.. +..: ........ +0 +NOTYPE +GLOBAL +DEFAULT +12 _bss_end__ +diff --git a/ld/testsuite/ld-avr/avr-prop-7.d b/ld/testsuite/ld-avr/avr-prop-7.d +new file mode 100644 +index 0000000..9f2cea9 +--- /dev/null ++++ b/ld/testsuite/ld-avr/avr-prop-7.d +@@ -0,0 +1,15 @@ ++#name: AVR .avr.prop, AVR_7_PCREL after align ++#as: -mavrxmega2 -mlink-relax ++#ld: -mavrxmega2 --relax ++#source: avr-prop-7.s ++#objdump: -S ++#target: avr-*-* ++ ++#... ++00000000 <__ctors_end>: ++ 0: 04 d0 rcall .+8 ; 0xa ++ 2: 00 00 nop ++ 4: 00 00 nop ++ 6: 86 e0 ldi r24, 0x06 ; 6 ++ 8: f0 f7 brcc .-4 ; 0x6 <__ctors_end\+0x6> ++#... +diff --git a/ld/testsuite/ld-avr/avr-prop-7.s b/ld/testsuite/ld-avr/avr-prop-7.s +new file mode 100644 +index 0000000..38276ba +--- /dev/null ++++ b/ld/testsuite/ld-avr/avr-prop-7.s +@@ -0,0 +1,8 @@ ++ call foo ++ nop ++ .p2align 1 ++ nop ++.L618: ++ ldi r24,lo8(6) ++ brsh .L618 ++foo: nop +diff --git a/ld/testsuite/ld-avr/avr-prop-8.d b/ld/testsuite/ld-avr/avr-prop-8.d +new file mode 100644 +index 0000000..2905f98 +--- /dev/null ++++ b/ld/testsuite/ld-avr/avr-prop-8.d +@@ -0,0 +1,13 @@ ++#name: AVR .avr.prop, AVR_7_PCREL just before align ++#as: -mavrxmega2 -mlink-relax ++#ld: -mavrxmega2 --relax ++#source: avr-prop-8.s ++#objdump: -S ++#target: avr-*-* ++ ++#... ++00000000 <__ctors_end>: ++ 0: ff cf rjmp .-2 ; 0x0 <__ctors_end> ++ 2: fe df rcall .-4 ; 0x0 <__ctors_end> ++ 4: f8 f7 brcc .-2 ; 0x4 <__ctors_end\+0x4> ++#... +diff --git a/ld/testsuite/ld-avr/avr-prop-8.s b/ld/testsuite/ld-avr/avr-prop-8.s +new file mode 100644 +index 0000000..34554f2 +--- /dev/null ++++ b/ld/testsuite/ld-avr/avr-prop-8.s +@@ -0,0 +1,7 @@ ++foo: ++ jmp foo ++ call foo ++.L1: ++ brsh .L1 ++.p2align 1 ++ nop diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog -index c420bdd..6800704 100644 +index c420bdd..43841f5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog -@@ -2,6 +2,10 @@ - - * configure: Regenerate. - +@@ -1,3 +1,26 @@ ++2016-09-16 Peter Bergner ++ ++ Apply from master. ++ 2016-09-14 Peter Bergner ++ ++ * ppc-opc.c (powerpc_opcodes) : New mnemonic. ++ : Delete mnemonics. ++ : Rename mnemonic from ... ++ : ...to this. ++ : Change to a X form instruction. ++ : Change to 1 operand form. ++ : Delete mnemonic. ++ : Rename mnemonic from ... ++ : ...to this. ++ : Delete mnemonics. ++ : Rename mnemonic from ... ++ : ...to this. ++ +2016-08-03 Tristan Gingold + + * configure: Regenerate. + - 2016-07-01 Tristan Gingold + 2016-08-03 Tristan Gingold * configure: Regenerate. diff --git a/opcodes/configure b/opcodes/configure @@ -1769,3 +2795,127 @@ index 5a4da06..f615634 100755 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c +index 8106ab7..7003e0c 100644 +--- a/opcodes/ppc-opc.c ++++ b/opcodes/ppc-opc.c +@@ -3161,7 +3161,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"machhwu.", XO (4, 12,0,1), XO_MASK, MULHW, 0, {RT, RA, RB}}, + {"ps_muls1", A (4, 13,0), AFRB_MASK, PPCPS, 0, {FRT, FRA, FRC}}, + {"ps_muls1.", A (4, 13,1), AFRB_MASK, PPCPS, 0, {FRT, FRA, FRC}}, +-{"rldixor", VXASH(4,26), VXASH_MASK, POWER9, 0, {RA, RS, SH6, RB}}, + {"ps_madds0", A (4, 14,0), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, + {"ps_madds0.", A (4, 14,1), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, + {"ps_madds1", A (4, 15,0), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, +@@ -3203,8 +3202,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"ps_msub.", A (4, 28,1), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, + {"ps_madd", A (4, 29,0), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, + {"ps_madd.", A (4, 29,1), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, +-{"xor3", VXA(4, 54), VXA_MASK, POWER9, 0, {RA, RS, RB, RC}}, +-{"nandxor", VXA(4, 55), VXA_MASK, POWER9, 0, {RA, RS, RB, RC}}, + {"vpermr", VXA(4, 59), VXA_MASK, PPCVEC3, 0, {VD, VA, VB, VC}}, + {"ps_nmsub", A (4, 30,0), A_MASK, PPCPS, 0, {FRT, FRA, FRC, FRB}}, + {"vaddeuqm", VXA(4, 60), VXA_MASK, PPCVEC2, 0, {VD, VA, VB, VC}}, +@@ -4943,8 +4940,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"dcbfep", XRT(31,127,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, + +-{"setb", VX(31,256), VXVB_MASK|(3<<16), POWER9, 0, {RT, BFA}}, +-{"setbool", VX(31,257), VXVB_MASK, POWER9, 0, {RT, BA}}, ++{"setb", X(31,128), XRB_MASK|(3<<16), POWER9, 0, {RT, BFA}}, + + {"wrtee", X(31,131), XRARB_MASK, PPC403|BOOKE|PPCA2|PPC476, 0, {RS}}, + +@@ -4994,8 +4990,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"prtyw", X(31,154), XRB_MASK, POWER6|PPCA2|PPC476, 0, {RA, RS}}, + +-{"brw", X(31,155), XRB_MASK, POWER9, 0, {RA, RS}}, +- + {"stdepx", X(31,157), X_MASK, E500MC|PPCA2, 0, {RS, RA0, RB}}, + + {"stwepx", X(31,159), X_MASK, E500MC|PPCA2, 0, {RS, RA0, RB}}, +@@ -5008,7 +5002,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"sthfcmx", APU(31,167,0), APU_MASK, PPC405, 0, {FCRT, RA, RB}}, + + {"addex", ZRC(31,170,0), Z2_MASK, POWER9, 0, {RT, RA, RB, CY}}, +-{"addex.", ZRC(31,170,1), Z2_MASK, POWER9, 0, {RT, RA, RB, CY}}, + + {"msgclrp", XRTRA(31,174,0,0), XRTRA_MASK, POWER8, 0, {RB}}, + {"dcbtlse", X(31,174), X_MASK, PPCCHLK, E500MC, {CT, RA0, RB}}, +@@ -5033,8 +5026,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"prtyd", X(31,186), XRB_MASK, POWER6|PPCA2, 0, {RA, RS}}, + +-{"brd", X(31,187), XRB_MASK, POWER9, 0, {RA, RS}}, +- + {"cmprb", X(31,192), XCMP_MASK, POWER9, 0, {BF, L, RA, RB}}, + + {"icblq.", XRC(31,198,1), X_MASK, E6500, 0, {CT, RA0, RB}}, +@@ -5073,8 +5064,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"sleq", XRC(31,217,0), X_MASK, M601, 0, {RA, RS, RB}}, + {"sleq.", XRC(31,217,1), X_MASK, M601, 0, {RA, RS, RB}}, + +-{"brh", X(31,219), XRB_MASK, POWER9, 0, {RA, RS}}, +- + {"stbepx", X(31,223), X_MASK, E500MC|PPCA2, 0, {RS, RA0, RB}}, + + {"cmpeqb", X(31,224), XCMPL_MASK, POWER9, 0, {BF, RA, RB}}, +@@ -5541,8 +5530,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"mtvsrdd", X(31,435), XX1_MASK, PPCVSX3, 0, {XT6, RA0, RB}}, + +-{"lwzmx", X(31,437), X_MASK, POWER9, 0, {RT, RA0, RB}}, +- + {"ecowx", X(31,438), X_MASK, PPC, E500|TITAN, {RT, RA0, RB}}, + + {"sthux", X(31,439), X_MASK, COM, 0, {RS, RAS, RB}}, +@@ -5906,8 +5893,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"hwsync", XSYNC(31,598,0), 0xffffffff, POWER4, BOOKE|PPC476, {0}}, + {"lwsync", XSYNC(31,598,1), 0xffffffff, PPC, E500, {0}}, + {"ptesync", XSYNC(31,598,2), 0xffffffff, PPC64, 0, {0}}, +-{"sync", X(31,598), XSYNCLE_MASK, POWER9|E6500, 0, {LS, ESYNC}}, +-{"sync", X(31,598), XSYNC_MASK, PPCCOM, BOOKE|PPC476|POWER9, {LS}}, ++{"sync", X(31,598), XSYNCLE_MASK, E6500, 0, {LS, ESYNC}}, ++{"sync", X(31,598), XSYNC_MASK, PPCCOM, BOOKE|PPC476, {LS}}, + {"msync", X(31,598), 0xffffffff, BOOKE|PPCA2|PPC476, 0, {0}}, + {"sync", X(31,598), 0xffffffff, BOOKE|PPC476, E6500, {0}}, + {"lwsync", X(31,598), 0xffffffff, E500, 0, {0}}, +@@ -6072,8 +6059,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"lvsm", X(31,773), X_MASK, PPCVEC2, 0, {VD, RA0, RB}}, + +-{"copy_first", XOPL(31,774,1), XRT_MASK, POWER9, 0, {RA0, RB}}, +-{"copy", X(31,774), XLRT_MASK, POWER9, 0, {RA0, RB, L}}, ++{"copy", XOPL(31,774,1), XRT_MASK, POWER9, 0, {RA0, RB}}, + + {"stvepxl", X(31,775), X_MASK, PPCVEC2, 0, {VS, RA0, RB}}, + {"lvlxl", X(31,775), X_MASK, CELL, 0, {VD, RA0, RB}}, +@@ -6143,7 +6129,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"lvtlxl", X(31,837), X_MASK, PPCVEC2, 0, {VD, RA0, RB}}, + +-{"cp_abort", X(31,838), XRTRARB_MASK,POWER9, 0, {0}}, ++{"cpabort", X(31,838), XRTRARB_MASK,POWER9, 0, {0}}, + + {"divo", XO(31,331,1,0), XO_MASK, M601, 0, {RT, RA, RB}}, + {"divo.", XO(31,331,1,1), XO_MASK, M601, 0, {RT, RA, RB}}, +@@ -6155,6 +6141,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"tlbsrx.", XRC(31,850,1), XRT_MASK, PPCA2, 0, {RA0, RB}}, + ++{"slbiag", X(31,850), XRARB_MASK, POWER9, 0, {RS}}, + {"slbmfev", X(31,851), XRLA_MASK, POWER9, 0, {RT, RB, A_L}}, + {"slbmfev", X(31,851), XRA_MASK, PPC64, POWER9, {RT, RB}}, + +@@ -6190,9 +6177,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"extswsli", XS(31,445,0), XS_MASK, POWER9, 0, {RA, RS, SH6}}, + {"extswsli.", XS(31,445,1), XS_MASK, POWER9, 0, {RA, RS, SH6}}, + +-{"paste", XRC(31,902,0), XLRT_MASK, POWER9, 0, {RA0, RB, L0}}, +-{"paste_last", XRCL(31,902,1,1),XRT_MASK, POWER9, 0, {RA0, RB}}, +-{"paste.", XRC(31,902,1), XLRT_MASK, POWER9, 0, {RA0, RB, L1}}, ++{"paste.", XRCL(31,902,1,1),XRT_MASK, POWER9, 0, {RA0, RB}}, + + {"stvlxl", X(31,903), X_MASK, CELL, 0, {VS, RA0, RB}}, + {"stdfcmux", APU(31,903,0), APU_MASK, PPC405, 0, {FCRT, RA, RB}}, diff --git a/binutils-2.27-fix-section-order.diff b/binutils-2.27-fix-section-order.diff new file mode 100644 index 0000000..2cc0084 --- /dev/null +++ b/binutils-2.27-fix-section-order.diff @@ -0,0 +1,2205 @@ +commit dd90581873482f67922a4ace92dafdfdfed09f3c +Author: Nick Clifton +Date: Fri Aug 19 09:16:30 2016 +0100 + + Place .shstrtab section after .symtab and .strtab, thus restoring monotonically increasing section offsets. + + bfd + * elf.c (assign_section_numbers): Assign number for the .shstrtab + section after the symbol table and string table sections. + + binutils + * testsuite/binutils-all/readelf.s: Adjust expected ordering of + sections. + * testsuite/binutils-all/readelf.s-64: Likewise. + + gas + * testsuite/gas/i386/ilp32/x86-64-unwind.d: Adjust expected ordering + of sections. + * testsuite/gas/i386/x86-64-unwind.d: Likewise. + * testsuite/gas/ia64/alias-ilp32.d: Likewise. + * testsuite/gas/ia64/alias.d: Likewise. + * testsuite/gas/ia64/group-1.d: Likewise. + * testsuite/gas/ia64/group-2.d: Likewise. + * testsuite/gas/ia64/secname-ilp32.d: Likewise. + * testsuite/gas/ia64/secname.d: Likewise. + * testsuite/gas/ia64/unwind-ilp32.d: Likewise. + * testsuite/gas/ia64/unwind.d: Likewise. + * testsuite/gas/ia64/xdata-ilp32.d: Likewise. + * testsuite/gas/ia64/xdata.d: Likewise. + * testsuite/gas/mmix/bspec-1.d: Likewise. + * testsuite/gas/mmix/bspec-2.d: Likewise. + * testsuite/gas/mmix/byte-1.d: Likewise. + * testsuite/gas/mmix/loc-1.d: Likewise. + * testsuite/gas/mmix/loc-2.d: Likewise. + * testsuite/gas/mmix/loc-3.d: Likewise. + * testsuite/gas/mmix/loc-4.d: Likewise. + * testsuite/gas/mmix/loc-5.d: Likewise. + * testsuite/gas/tic6x/scomm-directive-4.d: Likewise. + + ld + * testsuite/ld-alpha/tlsbin.rd: Adjust expected ordering of sections. + * testsuite/ld-alpha/tlsbinr.rd: Likewise. + * testsuite/ld-alpha/tlspic.rd: Likewise. + * testsuite/ld-cris/libdso-2.d: Likewise. + * testsuite/ld-i386/nogot1.d: Likewise. + * testsuite/ld-i386/pr12718.d: Likewise. + * testsuite/ld-i386/pr12921.d: Likewise. + * testsuite/ld-i386/tlsbin-nacl.rd: Likewise. + * testsuite/ld-i386/tlsbin.rd: Likewise. + * testsuite/ld-i386/tlsbin2-nacl.rd: Likewise. + * testsuite/ld-i386/tlsbin2.rd: Likewise. + * testsuite/ld-i386/tlsbindesc-nacl.rd: Likewise. + * testsuite/ld-i386/tlsbindesc.rd: Likewise. + * testsuite/ld-i386/tlsdesc-nacl.rd: Likewise. + * testsuite/ld-i386/tlsdesc.rd: Likewise. + * testsuite/ld-i386/tlsgdesc-nacl.rd: Likewise. + * testsuite/ld-i386/tlsgdesc.rd: Likewise. + * testsuite/ld-i386/tlsnopic-nacl.rd: Likewise. + * testsuite/ld-i386/tlsnopic.rd: Likewise. + * testsuite/ld-i386/tlspic-nacl.rd: Likewise. + * testsuite/ld-i386/tlspic.rd: Likewise. + * testsuite/ld-i386/tlspic2-nacl.rd: Likewise. + * testsuite/ld-i386/tlspic2.rd: Likewise. + * testsuite/ld-ia64/tlsbin.rd: Likewise. + * testsuite/ld-ia64/tlspic.rd: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-10.d: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-50.d: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-60.d: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-70.d: Likewise. + * testsuite/ld-mmix/bspec1.d: Likewise. + * testsuite/ld-mmix/bspec2.d: Likewise. + * testsuite/ld-mmix/local1.d: Likewise. + * testsuite/ld-mmix/local3.d: Likewise. + * testsuite/ld-mmix/local5.d: Likewise. + * testsuite/ld-mmix/local7.d: Likewise. + * testsuite/ld-mmix/undef-3.d: Likewise. + * testsuite/ld-powerpc/tlsexe.r: Likewise. + * testsuite/ld-powerpc/tlsexe32.r: Likewise. + * testsuite/ld-powerpc/tlsexetoc.r: Likewise. + * testsuite/ld-powerpc/tlsso.r: Likewise. + * testsuite/ld-powerpc/tlsso32.r: Likewise. + * testsuite/ld-powerpc/tlstocso.r: Likewise. + * testsuite/ld-s390/tlsbin.rd: Likewise. + * testsuite/ld-s390/tlsbin_64.rd: Likewise. + * testsuite/ld-s390/tlspic.rd: Likewise. + * testsuite/ld-s390/tlspic_64.rd: Likewise. + * testsuite/ld-sh/sh64/crange1.rd: Likewise. + * testsuite/ld-sh/sh64/crange2.rd: Likewise. + * testsuite/ld-sh/sh64/crange3-cmpct.rd: Likewise. + * testsuite/ld-sh/sh64/crange3-media.rd: Likewise. + * testsuite/ld-sh/sh64/crange3.rd: Likewise. + * testsuite/ld-sh/sh64/crangerel1.rd: Likewise. + * testsuite/ld-sh/sh64/crangerel2.rd: Likewise. + * testsuite/ld-sh/tlsbin-2.d: Likewise. + * testsuite/ld-sh/tlspic-2.d: Likewise. + * testsuite/ld-sparc/gotop32.rd: Likewise. + * testsuite/ld-sparc/gotop64.rd: Likewise. + * testsuite/ld-sparc/tlssunbin32.rd: Likewise. + * testsuite/ld-sparc/tlssunbin64.rd: Likewise. + * testsuite/ld-sparc/tlssunnopic32.rd: Likewise. + * testsuite/ld-sparc/tlssunnopic64.rd: Likewise. + * testsuite/ld-sparc/tlssunpic32.rd: Likewise. + * testsuite/ld-sparc/tlssunpic64.rd: Likewise. + * testsuite/ld-tic6x/common.d: Likewise. + * testsuite/ld-tic6x/shlib-1.rd: Likewise. + * testsuite/ld-tic6x/shlib-1b.rd: Likewise. + * testsuite/ld-tic6x/shlib-1r.rd: Likewise. + * testsuite/ld-tic6x/shlib-1rb.rd: Likewise. + * testsuite/ld-tic6x/shlib-app-1.rd: Likewise. + * testsuite/ld-tic6x/shlib-app-1b.rd: Likewise. + * testsuite/ld-tic6x/shlib-app-1r.rd: Likewise. + * testsuite/ld-tic6x/shlib-app-1rb.rd: Likewise. + * testsuite/ld-tic6x/shlib-noindex.rd: Likewise. + * testsuite/ld-tic6x/static-app-1.rd: Likewise. + * testsuite/ld-tic6x/static-app-1b.rd: Likewise. + * testsuite/ld-tic6x/static-app-1r.rd: Likewise. + * testsuite/ld-tic6x/static-app-1rb.rd: Likewise. + * testsuite/ld-x86-64/ilp32-4-nacl.d: Likewise. + * testsuite/ld-x86-64/ilp32-4.d: Likewise. + * testsuite/ld-x86-64/nogot1.d: Likewise. + * testsuite/ld-x86-64/pr12718.d: Likewise. + * testsuite/ld-x86-64/pr12921.d: Likewise. + * testsuite/ld-x86-64/split-by-file-nacl.rd: Likewise. + * testsuite/ld-x86-64/split-by-file.rd: Likewise. + * testsuite/ld-x86-64/tlsbin-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlsbin.rd: Likewise. + * testsuite/ld-x86-64/tlsbin2-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlsbin2.rd: Likewise. + * testsuite/ld-x86-64/tlsbindesc-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlsbindesc.rd: Likewise. + * testsuite/ld-x86-64/tlsdesc-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlsdesc.rd: Likewise. + * testsuite/ld-x86-64/tlsgdesc-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlsgdesc.rd: Likewise. + * testsuite/ld-x86-64/tlspic-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlspic.rd: Likewise. + * testsuite/ld-x86-64/tlspic2-nacl.rd: Likewise. + * testsuite/ld-x86-64/tlspic2.rd: Likewise. + * testsuite/ld-xtensa/tlsbin.rd: Likewise. + * testsuite/ld-xtensa/tlspic.rd: Likewise. + +diff --git a/bfd/elf.c b/bfd/elf.c +index 274cd53..c3630d2 100644 +--- a/bfd/elf.c ++++ b/bfd/elf.c +@@ -3093,7 +3093,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg) + compressed. */ + asect->flags |= SEC_ELF_COMPRESS; + +- /* If this section will be compressed, delay adding setion ++ /* If this section will be compressed, delay adding section + name to section name section after it is compressed in + _bfd_elf_assign_file_positions_for_non_load. */ + delay_st_name_p = TRUE; +@@ -3595,10 +3595,6 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) + d->rela.idx = 0; + } + +- elf_shstrtab_sec (abfd) = section_number++; +- _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->shstrtab_hdr.sh_name); +- elf_elfheader (abfd)->e_shstrndx = elf_shstrtab_sec (abfd); +- + need_symtab = (bfd_get_symcount (abfd) > 0 + || (link_info == NULL + && ((abfd->flags & (EXEC_P | DYNAMIC | HAS_RELOC)) +@@ -3626,6 +3622,10 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) + _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->strtab_hdr.sh_name); + } + ++ elf_shstrtab_sec (abfd) = section_number++; ++ _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->shstrtab_hdr.sh_name); ++ elf_elfheader (abfd)->e_shstrndx = elf_shstrtab_sec (abfd); ++ + if (section_number >= SHN_LORESERVE) + { + _bfd_error_handler (_("%B: too many sections: %u"), +@@ -6028,7 +6028,7 @@ _bfd_elf_assign_file_positions_for_non_load (bfd *abfd) + return FALSE; + name = new_name; + } +- /* Add setion name to section name section. */ ++ /* Add section name to section name section. */ + if (shdrp->sh_name != (unsigned int) -1) + abort (); + shdrp->sh_name +@@ -6036,7 +6036,7 @@ _bfd_elf_assign_file_positions_for_non_load (bfd *abfd) + name, FALSE); + d = elf_section_data (sec); + +- /* Add reloc setion name to section name section. */ ++ /* Add reloc section name to section name section. */ + if (d->rel.hdr + && !_bfd_elf_set_reloc_sh_name (abfd, + d->rel.hdr, +diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d +index 5cea05e..5dc74d6 100644 +--- a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d ++++ b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d +@@ -11,8 +11,8 @@ Section Headers: + \[ 2\] .data PROGBITS 00000000 000034 000000 00 WA 0 0 1 + \[ 3\] .bss NOBITS 00000000 000034 000000 00 WA 0 0 1 + \[ 4\] .eh_frame X86_64_UNWIND 00000000 000034 000008 00 A 0 0 1 +- \[ 5\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000036 00 . 0 0 1 +- \[ 6\] .symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 7 5 4 +- \[ 7\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 . 0 0 1 ++ \[ 5\] .symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 6 5 4 ++ \[ 6\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 . 0 0 1 ++ \[ 7\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000036 00 . 0 0 1 + Key to Flags: + #pass +diff --git a/gas/testsuite/gas/i386/x86-64-unwind.d b/gas/testsuite/gas/i386/x86-64-unwind.d +index 7a4c64c..89f1a65 100644 +--- a/gas/testsuite/gas/i386/x86-64-unwind.d ++++ b/gas/testsuite/gas/i386/x86-64-unwind.d +@@ -16,11 +16,11 @@ Section Headers: + 0000000000000000 0000000000000000 WA 0 0 1 + \[ 4\] \.eh_frame X86_64_UNWIND 0000000000000000 00000040 + 0000000000000008 0000000000000000 A 0 0 1 +- \[ 5\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ +- 0000000000000036 0000000000000000 . 0 0 1 +- \[ 6\] \.symtab SYMTAB 0000000000000000 [0-9a-f]+ +- 0000000000000078 0000000000000018 7 5 8 +- \[ 7\] \.strtab STRTAB 0000000000000000 [0-9a-f]+ ++ \[ 5\] \.symtab SYMTAB 0000000000000000 [0-9a-f]+ ++ 0000000000000078 0000000000000018 6 5 8 ++ \[ 6\] \.strtab STRTAB 0000000000000000 [0-9a-f]+ + 0000000000000001 0000000000000000 . 0 0 1 ++ \[ 7\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ ++ 0000000000000036 0000000000000000 . 0 0 1 + Key to Flags: + #... +diff --git a/gas/testsuite/gas/ia64/alias-ilp32.d b/gas/testsuite/gas/ia64/alias-ilp32.d +index d882b3c..df05d36 100644 +--- a/gas/testsuite/gas/ia64/alias-ilp32.d ++++ b/gas/testsuite/gas/ia64/alias-ilp32.d +@@ -12,9 +12,9 @@ Section Headers: + +\[ 2\] .data +PROGBITS +00000000 000040 000000 00 +WA +0 +0 +1 + +\[ 3\] .bss +NOBITS +00000000 000040 000000 00 +WA +0 +0 +1 + +\[ 4\] 1234 +PROGBITS +00000000 000040 000005 00 +WA +0 +0 +1 +- +\[ 5\] .shstrtab +STRTAB +00000000 [0-9a-f]+ 000031 00 +0 +0 +1 +- +\[ 6\] .symtab +SYMTAB +00000000 [0-9a-f]+ 000060 10 +7 +6 +4 +- +\[ 7\] .strtab +STRTAB +00000000 [0-9a-f]+ 000006 00 +0 +0 +1 ++ +\[ 5\] .symtab +SYMTAB +00000000 [0-9a-f]+ 000060 10 +6 +6 +4 ++ +\[ 6\] .strtab +STRTAB +00000000 [0-9a-f]+ 000006 00 +0 +0 +1 ++ +\[ 7\] .shstrtab +STRTAB +00000000 [0-9a-f]+ 000031 00 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/ia64/alias.d b/gas/testsuite/gas/ia64/alias.d +index 398bff4..23b9330 100644 +--- a/gas/testsuite/gas/ia64/alias.d ++++ b/gas/testsuite/gas/ia64/alias.d +@@ -16,12 +16,12 @@ Section Headers: + +0000000000000000 +0000000000000000 +WA +0 +0 +1 + +\[ 4\] 1234 +PROGBITS +0000000000000000 +00000040 + +0000000000000005 +0000000000000000 +WA +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +0000000000000031 +0000000000000000 +0 +0 +1 +- +\[ 6\] \.symtab +SYMTAB +0000000000000000 .* +- +0000000000000090 +0000000000000018 +7 +6 +8 +- +\[ 7\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* ++ +0000000000000090 +0000000000000018 +6 +6 +8 ++ +\[ 6\] \.strtab +STRTAB +0000000000000000 .* + +0000000000000006 +0000000000000000 +0 +0 +1 ++ +\[ 7\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +0000000000000031 +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/ia64/group-1.d b/gas/testsuite/gas/ia64/group-1.d +index b4eab14..b90bd88 100644 +--- a/gas/testsuite/gas/ia64/group-1.d ++++ b/gas/testsuite/gas/ia64/group-1.d +@@ -18,12 +18,12 @@ Section Headers: + 0000000000000000 0000000000000000 WA 0 0 1 + \[ 5\] \.text PROGBITS 0000000000000000 00000050 + 0000000000000010 0000000000000000 AXG 0 0 16 +- \[ 6\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ +- 0000000000000033 0000000000000000 0 0 1 +- \[ 7\] \.symtab SYMTAB 0000000000000000 .* +- 00000000000000c0 0000000000000018 8 8 8 +- \[ 8\] \.strtab STRTAB 0000000000000000 .* ++ \[ 6\] \.symtab SYMTAB 0000000000000000 .* ++ 00000000000000c0 0000000000000018 7 8 8 ++ \[ 7\] \.strtab STRTAB 0000000000000000 .* + 000000000000000[7c] 0000000000000000 0 0 1 ++ \[ 8\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ ++ 0000000000000033 0000000000000000 0 0 1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/ia64/group-2.d b/gas/testsuite/gas/ia64/group-2.d +index 7370367..cc8413f 100644 +--- a/gas/testsuite/gas/ia64/group-2.d ++++ b/gas/testsuite/gas/ia64/group-2.d +@@ -25,12 +25,12 @@ Section Headers: + 0000000000000018 0000000000000000 ALG 5 5 8 + \[ 8\] \.rela\.gnu\.linkonc RELA 0000000000000000 .* + 0000000000000048 0000000000000018 I 10 7 8 +- \[ 9\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ +- 0000000000000081 0000000000000000 0 0 1 +- \[10\] \.symtab SYMTAB 0000000000000000 .* +- 00000000000000d8 0000000000000018 11 9 8 +- \[11\] \.strtab STRTAB 0000000000000000 .* ++ \[ 9\] \.symtab SYMTAB 0000000000000000 .* ++ 00000000000000d8 0000000000000018 10 9 8 ++ \[10\] \.strtab STRTAB 0000000000000000 .* + 0000000000000005 0000000000000000 0 0 1 ++ \[11\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ ++ 0000000000000081 0000000000000000 0 0 1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/ia64/secname-ilp32.d b/gas/testsuite/gas/ia64/secname-ilp32.d +index 4146307..0b8a771 100644 +--- a/gas/testsuite/gas/ia64/secname-ilp32.d ++++ b/gas/testsuite/gas/ia64/secname-ilp32.d +@@ -12,8 +12,8 @@ Section Headers: + \[ 2\] .data PROGBITS 00000000 000040 000000 00 WA 0 0 1 + \[ 3\] .bss NOBITS 00000000 000040 000000 00 WA 0 0 1 + \[ 4\] .foo PROGBITS 00000000 000040 000008 00 WA 0 0 8 +- \[ 5\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000031 00 0 0 1 +- \[ 6\] .symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 7 5 4 +- \[ 7\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 0 0 1 ++ \[ 5\] .symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 6 5 4 ++ \[ 6\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 0 0 1 ++ \[ 7\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000031 00 0 0 1 + Key to Flags: + #... +diff --git a/gas/testsuite/gas/ia64/secname.d b/gas/testsuite/gas/ia64/secname.d +index 79f1e33..9d02e1a 100644 +--- a/gas/testsuite/gas/ia64/secname.d ++++ b/gas/testsuite/gas/ia64/secname.d +@@ -16,11 +16,11 @@ Section Headers: + 0000000000000000 0000000000000000 WA 0 0 1 + \[ 4\] \.foo PROGBITS 0000000000000000 00000040 + 0000000000000008 0000000000000000 WA 0 0 8 +- \[ 5\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ +- 0000000000000031 0000000000000000 0 0 1 +- \[ 6\] \.symtab SYMTAB 0000000000000000 .* +- 0000000000000078 0000000000000018 7 5 8 +- \[ 7\] \.strtab STRTAB 0000000000000000 .* ++ \[ 5\] \.symtab SYMTAB 0000000000000000 .* ++ 0000000000000078 0000000000000018 6 5 8 ++ \[ 6\] \.strtab STRTAB 0000000000000000 .* + 0000000000000001 0000000000000000 0 0 1 ++ \[ 7\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ ++ 0000000000000031 0000000000000000 0 0 1 + Key to Flags: + #... +diff --git a/gas/testsuite/gas/ia64/unwind-ilp32.d b/gas/testsuite/gas/ia64/unwind-ilp32.d +index cd25b0d..e96f89b 100644 +--- a/gas/testsuite/gas/ia64/unwind-ilp32.d ++++ b/gas/testsuite/gas/ia64/unwind-ilp32.d +@@ -13,8 +13,8 @@ Section Headers: + \[ 3\] .bss NOBITS 00000000 000040 000000 00 WA 0 0 1 + \[ 4\] .IA_64.unwind_inf PROGBITS 00000000 000040 000008 00 A 0 0 8 + \[ 5\] .IA_64.unwind IA_64_UNWIND 00000000 000048 000008 00 AL 1 1 8 +- \[ 6\] .shstrtab STRTAB 00000000 [0-9a-f]+ 00004d 00 0 0 1 +- \[ 7\] .symtab SYMTAB 00000000 [0-9a-f]+ 000060 10 8 6 4 +- \[ 8\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 0 0 1 ++ \[ 6\] .symtab SYMTAB 00000000 [0-9a-f]+ 000060 10 7 6 4 ++ \[ 7\] .strtab STRTAB 00000000 [0-9a-f]+ 000001 00 0 0 1 ++ \[ 8\] .shstrtab STRTAB 00000000 [0-9a-f]+ 00004d 00 0 0 1 + Key to Flags: + #... +diff --git a/gas/testsuite/gas/ia64/unwind.d b/gas/testsuite/gas/ia64/unwind.d +index ce71a7a..bdb7af8 100644 +--- a/gas/testsuite/gas/ia64/unwind.d ++++ b/gas/testsuite/gas/ia64/unwind.d +@@ -18,11 +18,11 @@ Section Headers: + 0000000000000008 0000000000000000 A 0 0 8 + \[ 5\] \.IA_64\.unwind IA_64_UNWIND 0000000000000000 00000048 + 0000000000000008 0000000000000000 AL 1 1 8 +- \[ 6\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ +- 000000000000004d 0000000000000000 0 0 1 +- \[ 7\] \.symtab SYMTAB 0000000000000000 .* +- 0000000000000090 0000000000000018 8 6 8 +- \[ 8\] \.strtab STRTAB 0000000000000000 .* ++ \[ 6\] \.symtab SYMTAB 0000000000000000 .* ++ 0000000000000090 0000000000000018 7 6 8 ++ \[ 7\] \.strtab STRTAB 0000000000000000 .* + 0000000000000001 0000000000000000 0 0 1 ++ \[ 8\] \.shstrtab STRTAB 0000000000000000 [0-9a-f]+ ++ 000000000000004d 0000000000000000 0 0 1 + Key to Flags: + #... +diff --git a/gas/testsuite/gas/ia64/xdata-ilp32.d b/gas/testsuite/gas/ia64/xdata-ilp32.d +index 8c0bb30..e5dd507 100644 +--- a/gas/testsuite/gas/ia64/xdata-ilp32.d ++++ b/gas/testsuite/gas/ia64/xdata-ilp32.d +@@ -23,7 +23,7 @@ Section Headers: + \[13\] \.xreal\[4\] PROGBITS 00000000 [[:xdigit:]]+ 000020 00 A 0 0 16 + \[14\] \.xstr<1> PROGBITS 00000000 [[:xdigit:]]+ 000003 00 A 0 0 1 + \[15\] \.xstr\{2\} PROGBITS 00000000 [[:xdigit:]]+ 000004 00 A 0 0 1 +- \[16\] .shstrtab STRTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00 0 0 1 +- \[17\] .symtab SYMTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 10 18 15 4 +- \[18\] .strtab STRTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00 0 0 1 ++ \[16\] .symtab SYMTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 10 17 15 4 ++ \[17\] .strtab STRTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00 0 0 1 ++ \[18\] .shstrtab STRTAB 00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00 0 0 1 + #pass +diff --git a/gas/testsuite/gas/ia64/xdata.d b/gas/testsuite/gas/ia64/xdata.d +index dc23b78..eb12819 100644 +--- a/gas/testsuite/gas/ia64/xdata.d ++++ b/gas/testsuite/gas/ia64/xdata.d +@@ -38,10 +38,10 @@ Section Headers: + 0000000000000003 0000000000000000 A 0 0 1 + \[15\] \.xstr\{2\} PROGBITS 0000000000000000 [[:xdigit:]]+ + 0000000000000004 0000000000000000 A 0 0 1 +- \[16\] \.shstrtab STRTAB 0000000000000000 [[:xdigit:]]+ ++ \[16\] \.symtab SYMTAB 0000000000000000 [[:xdigit:]]+ ++ [[:xdigit:]]+ 0000000000000018 17 15 8 ++ \[17\] \.strtab STRTAB 0000000000000000 [[:xdigit:]]+ + [[:xdigit:]]+ 0000000000000000 0 0 1 +- \[17\] \.symtab SYMTAB 0000000000000000 [[:xdigit:]]+ +- [[:xdigit:]]+ 0000000000000018 18 15 8 +- \[18\] \.strtab STRTAB 0000000000000000 [[:xdigit:]]+ ++ \[18\] \.shstrtab STRTAB 0000000000000000 [[:xdigit:]]+ + [[:xdigit:]]+ 0000000000000000 0 0 1 + #pass +diff --git a/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d +index a18d242..4bbda8d 100644 +--- a/gas/testsuite/gas/mmix/bspec-1.d ++++ b/gas/testsuite/gas/mmix/bspec-1.d +@@ -4,7 +4,7 @@ There are 9 section headers, starting at offset .*: + +\[ 4\] \.MMIX\.spec_data\.2 +PROGBITS +0+ +0+44 + +0+4 +0+ +0 +0 +4 + +\[ 5\] \.rela\.MMIX\.spec_d +RELA +0+ +.* +- +0+18 +0+18 +I +7 +4 +8 ++ +0+18 +0+18 +I +6 +4 +8 + #... + Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x[0-9a-f]+ contains 1 entries: + .* +diff --git a/gas/testsuite/gas/mmix/bspec-2.d b/gas/testsuite/gas/mmix/bspec-2.d +index a9ce03d..ab3afd3 100644 +--- a/gas/testsuite/gas/mmix/bspec-2.d ++++ b/gas/testsuite/gas/mmix/bspec-2.d +@@ -4,11 +4,11 @@ There are 11 section headers, starting at offset .*: + \[ 4\] \.MMIX\.spec_data\.2 PROGBITS 0+ 0+48 + 0+10 0+ 0 0 8 + \[ 5\] \.rela\.MMIX\.spec_d RELA 0+ .* +- +0+30 0+18 +I +9 +4 +8 ++ +0+30 0+18 +I +8 +4 +8 + \[ 6\] \.MMIX\.spec_data\.3 PROGBITS 0+ 0+58 + 0+8 0+ 0 0 8 + \[ 7\] \.rela\.MMIX\.spec_d RELA 0+ .* +- +0+18 +0+18 +I +9 +6 +8 ++ +0+18 +0+18 +I +8 +6 +8 + #... + Relocation section '\.rela\.MMIX\.spec_data\.2' at offset .* contains 2 entries: + .* +diff --git a/gas/testsuite/gas/mmix/byte-1.d b/gas/testsuite/gas/mmix/byte-1.d +index b6c2768..a77eb08 100644 +--- a/gas/testsuite/gas/mmix/byte-1.d ++++ b/gas/testsuite/gas/mmix/byte-1.d +@@ -12,12 +12,12 @@ Section Headers: + +0000000000000000 +0000000000000000 +WA +0 +0 +1 + +\[ 3\] \.bss +NOBITS +0000000000000000 +00000056 + +0000000000000000 +0000000000000000 +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +000000000000002c +0000000000000000 +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* +- +00000000000000c0 +0000000000000018 +6 +7 +8 +- +\[ 6\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .* ++ +00000000000000c0 +0000000000000018 +5 +7 +8 ++ +\[ 5\] \.strtab +STRTAB +0000000000000000 .* + +0000000000000018 +0000000000000000 +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +000000000000002c +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/mmix/loc-1.d b/gas/testsuite/gas/mmix/loc-1.d +index e45b1d5..e46247d 100644 +--- a/gas/testsuite/gas/mmix/loc-1.d ++++ b/gas/testsuite/gas/mmix/loc-1.d +@@ -13,12 +13,12 @@ Section Headers: + +0000000000000004 +0000000000000000 +WA +0 +0 +4 + +\[ 3\] \.bss +NOBITS +0000000000000000 +00000064 + +0000000000000000 +0000000000000000 +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +000000000000002c +0000000000000000 +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* +- +00000000000000c0 +0000000000000018 +6 +6 +8 +- +\[ 6\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .* ++ +00000000000000c0 +0000000000000018 +5 +6 +8 ++ +\[ 5\] \.strtab +STRTAB +0000000000000000 .* + +000000000000002a +0000000000000000 +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +000000000000002c +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/mmix/loc-2.d b/gas/testsuite/gas/mmix/loc-2.d +index b92cabb..8d7ec8b 100644 +--- a/gas/testsuite/gas/mmix/loc-2.d ++++ b/gas/testsuite/gas/mmix/loc-2.d +@@ -13,12 +13,12 @@ Section Headers: + +0000000000000000 +0000000000000000 +WA +0 +0 +1 + +\[ 3\] \.bss +NOBITS +0000000000000000 +00000048 + +0000000000000000 +0000000000000000 +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +000000000000002c +0000000000000000 +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* +- +0000000000000090 +0000000000000018 +6 +4 +8 +- +\[ 6\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .* ++ +0000000000000090 +0000000000000018 +5 +4 +8 ++ +\[ 5\] \.strtab +STRTAB +0000000000000000 .* + +000000000000001a +0000000000000000 +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +000000000000002c +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/mmix/loc-3.d b/gas/testsuite/gas/mmix/loc-3.d +index 2c477db..14a68fa 100644 +--- a/gas/testsuite/gas/mmix/loc-3.d ++++ b/gas/testsuite/gas/mmix/loc-3.d +@@ -12,12 +12,12 @@ Section Headers: + +0000000000000008 +0000000000000000 +WA +0 +0 +4 + +\[ 3\] \.bss +NOBITS +0000000000000000 +00000054 + +0000000000000000 +0000000000000000 +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +000000000000002c +0000000000000000 +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* +- +00000000000000c0 +0000000000000018 +6 +5 +8 +- +\[ 6\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .* ++ +00000000000000c0 +0000000000000018 +5 +5 +8 ++ +\[ 5\] \.strtab +STRTAB +0000000000000000 .* + +000000000000002e +0000000000000000 +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +000000000000002c +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/mmix/loc-4.d b/gas/testsuite/gas/mmix/loc-4.d +index 1efc084..935cc18 100644 +--- a/gas/testsuite/gas/mmix/loc-4.d ++++ b/gas/testsuite/gas/mmix/loc-4.d +@@ -12,12 +12,12 @@ Section Headers: + +0000000000000004 +0000000000000000 +WA +0 +0 +4 + +\[ 3\] \.bss +NOBITS +0000000000000000 +0000005c + +0000000000000000 +0000000000000000 +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +- +000000000000002c +0000000000000000 +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .* +- +00000000000000c0 +0000000000000018 +6 +5 +8 +- +\[ 6\] \.strtab +STRTAB +0000000000000000 .* ++ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .* ++ +00000000000000c0 +0000000000000018 +5 +5 +8 ++ +\[ 5\] \.strtab +STRTAB +0000000000000000 .* + +000000000000003b +0000000000000000 +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ ++ +000000000000002c +0000000000000000 +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/mmix/loc-5.d b/gas/testsuite/gas/mmix/loc-5.d +index fa80a86..a8e7545 100644 +--- a/gas/testsuite/gas/mmix/loc-5.d ++++ b/gas/testsuite/gas/mmix/loc-5.d +@@ -12,12 +12,12 @@ Section Headers: + +0+24 +0+ +WA +0 +0 +4 + +\[ 3\] \.bss +NOBITS +0+ +0+6c + +0+ +0+ +WA +0 +0 +1 +- +\[ 4\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+2c +0+ +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0+ .* +- +0+c0 +0+18 +6 +6 +8 +- +\[ 6\] \.strtab +STRTAB +0+ .* ++ +\[ 4\] \.symtab +SYMTAB +0+ .* ++ +0+c0 +0+18 +5 +6 +8 ++ +\[ 5\] \.strtab +STRTAB +0+ .* + +0+27 +0+ +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+2c +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/gas/testsuite/gas/tic6x/scomm-directive-4.d b/gas/testsuite/gas/tic6x/scomm-directive-4.d +index 7822e8f..219673d 100644 +--- a/gas/testsuite/gas/tic6x/scomm-directive-4.d ++++ b/gas/testsuite/gas/tic6x/scomm-directive-4.d +@@ -12,9 +12,9 @@ Section Headers: + \[ 2\] \.data PROGBITS 00000000 000034 000000 00 WA 0 0 1 + \[ 3\] \.bss NOBITS 00000000 000034 000000 00 WA 0 0 1 + \[ 4\] \.c6xabi\.attribute C6000_ATTRIBUTE 00000000 000034 000013 00 0 0 1 +- \[ 5\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00003f 00 0 0 1 +- \[ 6\] \.symtab SYMTAB 00000000 [0-9a-f]+ 0000d0 10 7 5 4 +- \[ 7\] \.strtab STRTAB 00000000 [0-9a-f]+ 00001d 00 0 0 1 ++ \[ 5\] \.symtab SYMTAB 00000000 [0-9a-f]+ 0000d0 10 6 5 4 ++ \[ 6\] \.strtab STRTAB 00000000 [0-9a-f]+ 00001d 00 0 0 1 ++ \[ 7\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00003f 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd +index 2184e5e..21fb11a 100644 +--- a/ld/testsuite/ld-alpha/tlsbin.rd ++++ b/ld/testsuite/ld-alpha/tlsbin.rd +@@ -24,9 +24,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd +index 0329ba9..8b7b76a 100644 +--- a/ld/testsuite/ld-alpha/tlsbinr.rd ++++ b/ld/testsuite/ld-alpha/tlsbinr.rd +@@ -24,9 +24,9 @@ Section Headers: + +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1 + +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8 + +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8 +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd +index 7a97847..f1fb974 100644 +--- a/ld/testsuite/ld-alpha/tlspic.rd ++++ b/ld/testsuite/ld-alpha/tlspic.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d +index 3b4777a..aa4a7c8 100644 +--- a/ld/testsuite/ld-cris/libdso-2.d ++++ b/ld/testsuite/ld-cris/libdso-2.d +@@ -21,9 +21,9 @@ There are 13 section headers.* + +\[ 7\] \.text +PROGBITS .* + +\[ 8\] \.dynamic +DYNAMIC +.* + +\[ 9\] \.got +PROGBITS .* +- +\[10\] \.shstrtab +STRTAB +.* +- +\[11\] \.symtab +SYMTAB +.* +- +\[12\] \.strtab +STRTAB +.* ++ +\[10\] \.symtab +SYMTAB +.* ++ +\[11\] \.strtab +STRTAB +.* ++ +\[12\] \.shstrtab +STRTAB +.* + #... + Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + #... +diff --git a/ld/testsuite/ld-i386/nogot1.d b/ld/testsuite/ld-i386/nogot1.d +index a6c8832..018c24d 100644 +--- a/ld/testsuite/ld-i386/nogot1.d ++++ b/ld/testsuite/ld-i386/nogot1.d +@@ -4,5 +4,6 @@ + + #... + [ ]*\[.*\][ ]+\.dynamic[ ]+DYNAMIC.* ++#... + [ ]*\[.*\][ ]+.*STRTAB.* + #pass +diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d +index 87905c3..ec51540 100644 +--- a/ld/testsuite/ld-i386/pr12718.d ++++ b/ld/testsuite/ld-i386/pr12718.d +@@ -9,8 +9,8 @@ Section Headers: + +\[Nr\] Name +Type +Addr +Off +Size +ES +Flg +Lk +Inf +Al + +\[ 0\] +NULL +0+ +0+ +0+ +0+ +0 +0 +0 + +\[ 1\] +.text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +000006 00 +AX +0 +0 +1 +- +\[ 2\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1 +- +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 10 +4 +[0-9] +4 +- +\[ 4\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1 ++ +\[ 2\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 10 +3 +[0-9] +4 ++ +\[ 3\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1 ++ +\[ 4\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d +index c72b04c..e49079b 100644 +--- a/ld/testsuite/ld-i386/pr12921.d ++++ b/ld/testsuite/ld-i386/pr12921.d +@@ -11,8 +11,8 @@ Section Headers: + +\[ 1\] .text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+1 00 +AX +0 +0 +4096 + +\[ 2\] .data +PROGBITS +[0-9a-f]+ +[0-9a-f]+000 +0+20 +00 +WA +0 +0 +4096 + +\[ 3\] .bss +NOBITS +[0-9a-f]+ +[0-9a-f]+020 +0+10000 +00 +WA +0 +0 +4096 +- +\[ 4\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1 +- +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +10 +6 +[0-9] +4 +- +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 4\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +10 +5 +[0-9] +4 ++ +\[ 5\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 6\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-i386/tlsbin-nacl.rd b/ld/testsuite/ld-i386/tlsbin-nacl.rd +index 1e1cf7c..89a0673 100644 +--- a/ld/testsuite/ld-i386/tlsbin-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsbin-nacl.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0*10031100 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031124 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd +index 12b3e81..23fffd1 100644 +--- a/ld/testsuite/ld-i386/tlsbin.rd ++++ b/ld/testsuite/ld-i386/tlsbin.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+804a060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0+804a100 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0+804a124 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsbin2-nacl.rd b/ld/testsuite/ld-i386/tlsbin2-nacl.rd +index b23bfe0..0011716 100644 +--- a/ld/testsuite/ld-i386/tlsbin2-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsbin2-nacl.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0*100310e0 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031108 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsbin2.rd b/ld/testsuite/ld-i386/tlsbin2.rd +index 05d4ddb..e34d167 100644 +--- a/ld/testsuite/ld-i386/tlsbin2.rd ++++ b/ld/testsuite/ld-i386/tlsbin2.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+804a060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0+804a0e0 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0+804a108 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd +index 51cffc0..39c60a5 100644 +--- a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0*100310e0 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031104 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd +index 7f7194c..7cc85f1 100644 +--- a/ld/testsuite/ld-i386/tlsbindesc.rd ++++ b/ld/testsuite/ld-i386/tlsbindesc.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+804a060 .* + +\[[ 0-9]+\] \.got +PROGBITS +0+804a0e0 .* + +\[[ 0-9]+\] \.got\.plt +PROGBITS +0+804a104 .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsdesc-nacl.rd b/ld/testsuite/ld-i386/tlsdesc-nacl.rd +index b28744f..20c8ea2 100644 +--- a/ld/testsuite/ld-i386/tlsdesc-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsdesc-nacl.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd +index 68695ff..3486847 100644 +--- a/ld/testsuite/ld-i386/tlsdesc.rd ++++ b/ld/testsuite/ld-i386/tlsdesc.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd b/ld/testsuite/ld-i386/tlsgdesc-nacl.rd +index ba5fa62..407bf2c 100644 +--- a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsgdesc-nacl.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsgdesc.rd b/ld/testsuite/ld-i386/tlsgdesc.rd +index 929ffa2..269cede 100644 +--- a/ld/testsuite/ld-i386/tlsgdesc.rd ++++ b/ld/testsuite/ld-i386/tlsgdesc.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsnopic-nacl.rd b/ld/testsuite/ld-i386/tlsnopic-nacl.rd +index b14164a..15e7eea 100644 +--- a/ld/testsuite/ld-i386/tlsnopic-nacl.rd ++++ b/ld/testsuite/ld-i386/tlsnopic-nacl.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10010284 .* + +\[[ 0-9]+\] \.got +PROGBITS +0*10010304 .* + +\[[ 0-9]+\] \.got.plt +PROGBITS +0*1001031c .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd +index b754158..b60fb1d 100644 +--- a/ld/testsuite/ld-i386/tlsnopic.rd ++++ b/ld/testsuite/ld-i386/tlsnopic.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+20f4 .* + +\[[ 0-9]+\] \.got +PROGBITS +0+2174 .* + +\[[ 0-9]+\] \.got.plt +PROGBITS +0+218c .* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlspic-nacl.rd b/ld/testsuite/ld-i386/tlspic-nacl.rd +index b7d3e35..9645e35 100644 +--- a/ld/testsuite/ld-i386/tlspic-nacl.rd ++++ b/ld/testsuite/ld-i386/tlspic-nacl.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd +index f693760..6b915e5 100644 +--- a/ld/testsuite/ld-i386/tlspic.rd ++++ b/ld/testsuite/ld-i386/tlspic.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlspic2-nacl.rd b/ld/testsuite/ld-i386/tlspic2-nacl.rd +index 560e840..5fb6ba6 100644 +--- a/ld/testsuite/ld-i386/tlspic2-nacl.rd ++++ b/ld/testsuite/ld-i386/tlspic2-nacl.rd +@@ -20,9 +20,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-i386/tlspic2.rd b/ld/testsuite/ld-i386/tlspic2.rd +index a135547..ab00063 100644 +--- a/ld/testsuite/ld-i386/tlspic2.rd ++++ b/ld/testsuite/ld-i386/tlspic2.rd +@@ -20,9 +20,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd +index ab2dacd..08c6a59 100644 +--- a/ld/testsuite/ld-ia64/tlsbin.rd ++++ b/ld/testsuite/ld-ia64/tlsbin.rd +@@ -25,9 +25,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+150 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +60+1318 0+1318 0+48 00 WAp +0 +0 +8 + +\[[ 0-9]+\] .IA_64.pltoff +.* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd +index 9666f86..cfcf8ed 100644 +--- a/ld/testsuite/ld-ia64/tlspic.rd ++++ b/ld/testsuite/ld-ia64/tlspic.rd +@@ -24,9 +24,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+140 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+112d8 0+12d8 0+50 00 WAp +0 +0 +8 + +\[[ 0-9]+\] .IA_64.pltoff +.* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d +index e3a1c9c..8827e41 100644 +--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d ++++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d +@@ -22,7 +22,7 @@ ELF Header: + Number of program headers: 0 + Size of section headers: 40 \(bytes\) + Number of section headers: 11 +- Section header string table index: 8 ++ Section header string table index: 10 + + Attribute Section: gnu + File Attributes +diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d +index 5dc46d3..1fcab63 100644 +--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d ++++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d +@@ -22,7 +22,7 @@ ELF Header: + Number of program headers: 0 + Size of section headers: 40 \(bytes\) + Number of section headers: 11 +- Section header string table index: 8 ++ Section header string table index: 10 + Attribute Section: gnu + File Attributes + Tag_GNU_MIPS_ABI_FP: Hard float \(32-bit CPU, Any FPU\) +diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d +index ea80c18..48a9839 100644 +--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d ++++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d +@@ -22,7 +22,7 @@ ELF Header: + Number of program headers: 0 + Size of section headers: 40 \(bytes\) + Number of section headers: 11 +- Section header string table index: 8 ++ Section header string table index: 10 + Attribute Section: gnu + File Attributes + Tag_GNU_MIPS_ABI_FP: Hard float \(32-bit CPU, 64-bit FPU\) +diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d +index edbd61f..ca17421 100644 +--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d ++++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d +@@ -22,7 +22,7 @@ ELF Header: + Number of program headers: 0 + Size of section headers: 40 \(bytes\) + Number of section headers: 11 +- Section header string table index: 8 ++ Section header string table index: 10 + Attribute Section: gnu + File Attributes + Tag_GNU_MIPS_ABI_FP: Hard float compat \(32-bit CPU, 64-bit FPU\) +diff --git a/ld/testsuite/ld-mmix/bspec1.d b/ld/testsuite/ld-mmix/bspec1.d +index 6440bbe..3d07d2d 100644 +--- a/ld/testsuite/ld-mmix/bspec1.d ++++ b/ld/testsuite/ld-mmix/bspec1.d +@@ -14,12 +14,12 @@ Section Headers: + +0+4 +0+ +AX +0 +0 +4 + +\[ 2\] \.MMIX\.spec_data\.2 PROGBITS +0+ +0+7c + +0+4 +0+ +0 +0 +4 +- +\[ 3\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+33 +0+ +0 +0 +1 +- +\[ 4\] \.symtab +SYMTAB +0+ .* +- +0+d8 +0+18 +5 +3 +8 +- +\[ 5\] \.strtab +STRTAB +0+ .* ++ +\[ 3\] \.symtab +SYMTAB +0+ .* ++ +0+d8 +0+18 +4 +3 +8 ++ +\[ 4\] \.strtab +STRTAB +0+ .* + +0+26 +0+ +0 +0 +1 ++ +\[ 5\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+33 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/bspec2.d b/ld/testsuite/ld-mmix/bspec2.d +index e881b08..b18fe47 100644 +--- a/ld/testsuite/ld-mmix/bspec2.d ++++ b/ld/testsuite/ld-mmix/bspec2.d +@@ -19,12 +19,12 @@ Section Headers: + +0+8 +0+ +0 +0 +4 + +\[ 3\] \.MMIX\.spec_data\.3 PROGBITS +0+ +0+84 + +0+4 +0+ +0 +0 +4 +- +\[ 4\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+45 +0+ +0 +0 +1 +- +\[ 5\] \.symtab +SYMTAB +0+ .* +- +0+108 +0+18 +6 +4 +8 +- +\[ 6\] \.strtab +STRTAB +0+ .* ++ +\[ 4\] \.symtab +SYMTAB +0+ .* ++ +0+108 +0+18 +5 +4 +8 ++ +\[ 5\] \.strtab +STRTAB +0+ .* + +0+2b +0+ +0 +0 +1 ++ +\[ 6\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+45 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/local1.d b/ld/testsuite/ld-mmix/local1.d +index 478d17b..41a67c2 100644 +--- a/ld/testsuite/ld-mmix/local1.d ++++ b/ld/testsuite/ld-mmix/local1.d +@@ -21,12 +21,12 @@ Section Headers: + +0+8 +0+ +AX +0 +0 +4 + +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+80 + +0+10 +0+ +W +0 +0 +1 +- +\[ 3\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+34 +0+ +0 +0 +1 +- +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+ +- +[0-9a-f]+ +0+18 +5 +[0-9] +8 +- +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+ ++ +\[ 3\] \.symtab +SYMTAB +0+ +[0-9a-f]+ ++ +[0-9a-f]+ +0+18 +4 +[0-9] +8 ++ +\[ 4\] \.strtab +STRTAB +0+ +[0-9a-f]+ + +[0-9a-f]+ +0+ +0 +0 +1 ++ +\[ 5\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+34 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/local3.d b/ld/testsuite/ld-mmix/local3.d +index 9b9001a..74840d3 100644 +--- a/ld/testsuite/ld-mmix/local3.d ++++ b/ld/testsuite/ld-mmix/local3.d +@@ -19,12 +19,12 @@ Section Headers: + +0+8 +0+ +AX +0 +0 +4 + +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+80 + +0+10 +0+ +W +0 +0 +1 +- +\[ 3\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+34 +0+ +0 +0 +1 +- +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+ +- +[0-9a-f]+ +0+18 +5 +[0-9] +8 +- +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+ ++ +\[ 3\] \.symtab +SYMTAB +0+ +[0-9a-f]+ ++ +[0-9a-f]+ +0+18 +4 +[0-9] +8 ++ +\[ 4\] \.strtab +STRTAB +0+ +[0-9a-f]+ + +[0-9a-f]+ +0+ +0 +0 +1 ++ +\[ 5\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+34 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/local5.d b/ld/testsuite/ld-mmix/local5.d +index 93bacd3..ae81364 100644 +--- a/ld/testsuite/ld-mmix/local5.d ++++ b/ld/testsuite/ld-mmix/local5.d +@@ -20,12 +20,12 @@ Section Headers: + +0+c +0+ +AX +0 +0 +4 + +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+84 + +0+10 +0+ +W +0 +0 +1 +- +\[ 3\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+34 +0+ +0 +0 +1 +- +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+ +- +[0-9a-f]+ +0+18 +5 +[0-9] +8 +- +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+ ++ +\[ 3\] \.symtab +SYMTAB +0+ +[0-9a-f]+ ++ +[0-9a-f]+ +0+18 +4 +[0-9] +8 ++ +\[ 4\] \.strtab +STRTAB +0+ +[0-9a-f]+ + +[0-9a-f]+ +0+ +0 +0 +1 ++ +\[ 5\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+34 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/local7.d b/ld/testsuite/ld-mmix/local7.d +index 1495bf1..6d80cc9 100644 +--- a/ld/testsuite/ld-mmix/local7.d ++++ b/ld/testsuite/ld-mmix/local7.d +@@ -21,12 +21,12 @@ Section Headers: + +0+c +0+ +AX +0 +0 +4 + +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+84 + +0+10 +0+ +W +0 +0 +1 +- +\[ 3\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +- +0+34 +0+ +0 +0 +1 +- +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+ +- +[0-9a-f]+ +0+18 +5 +[0-9] +8 +- +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+ ++ +\[ 3\] \.symtab +SYMTAB +0+ +[0-9a-f]+ ++ +[0-9a-f]+ +0+18 +4 +[0-9] +8 ++ +\[ 4\] \.strtab +STRTAB +0+ +[0-9a-f]+ + +[0-9a-f]+ +0+ +0 +0 +1 ++ +\[ 5\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +0+34 +0+ +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-mmix/undef-3.d b/ld/testsuite/ld-mmix/undef-3.d +index 94eeeaa..6afb52b 100644 +--- a/ld/testsuite/ld-mmix/undef-3.d ++++ b/ld/testsuite/ld-mmix/undef-3.d +@@ -11,11 +11,11 @@ Section Headers: + +0+ +0+ +0 +0 +0 + +\[ 1\] \.text +PROGBITS +0+ +0+78 + +0+4 +0+ +AX +0 +0 +4 +- +\[ 2\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ ++ +\[ 2\] \.symtab +SYMTAB +0+ .* ++ +0+a8 +0+18 +3 +2 +8 ++ +\[ 3\] \.strtab +STRTAB +0+ .* + +0+21 +0+ +0 +0 +1 +- +\[ 3\] \.symtab +SYMTAB +0+ .* +- +0+a8 +0+18 +4 +2 +8 +- +\[ 4\] \.strtab +STRTAB +0+ .* ++ +\[ 4\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ + +0+21 +0+ +0 +0 +1 + Key to Flags: + #... +diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r +index db72ad7..11da4a8 100644 +--- a/ld/testsuite/ld-powerpc/tlsexe.r ++++ b/ld/testsuite/ld-powerpc/tlsexe.r +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] \.opd .* + +\[[ 0-9]+\] \.got +PROGBITS .* 0+30 08 +WA +0 +0 +256 + +\[[ 0-9]+\] \.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r +index a3304ec..baa3ee6 100644 +--- a/ld/testsuite/ld-powerpc/tlsexe32.r ++++ b/ld/testsuite/ld-powerpc/tlsexe32.r +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4 + +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000018 04 +WA +0 +0 +4 + +\[[ 0-9]+\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +4 +- +\[[ 0-9]+\] \.shstrtab +STRTAB +.* + +\[[ 0-9]+\] \.symtab +SYMTAB +.* + +\[[ 0-9]+\] \.strtab +STRTAB +.* ++ +\[[ 0-9]+\] \.shstrtab +STRTAB +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r +index 56716bb..5c4a490 100644 +--- a/ld/testsuite/ld-powerpc/tlsexetoc.r ++++ b/ld/testsuite/ld-powerpc/tlsexetoc.r +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] \.opd .* + +\[[ 0-9]+\] \.got +PROGBITS .* 0+58 08 +WA +0 +0 +256 + +\[[ 0-9]+\] \.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r +index fd3002b..4ba6173 100644 +--- a/ld/testsuite/ld-powerpc/tlsso.r ++++ b/ld/testsuite/ld-powerpc/tlsso.r +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.opd .* + +\[[ 0-9]+\] \.got .* + +\[[ 0-9]+\] \.plt .* +- +\[[ 0-9]+\] \.shstrtab .* + +\[[ 0-9]+\] \.symtab .* + +\[[ 0-9]+\] \.strtab .* ++ +\[[ 0-9]+\] \.shstrtab .* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r +index 4d12c48..bc3b7c0 100644 +--- a/ld/testsuite/ld-powerpc/tlsso32.r ++++ b/ld/testsuite/ld-powerpc/tlsso32.r +@@ -20,9 +20,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +DYNAMIC .* 08 +WA +3 +0 +4 + +\[[ 0-9]+\] \.got +PROGBITS .* 0+30 04 +WA +0 +0 +4 + +\[[ 0-9]+\] \.plt +PROGBITS .* 0+4 00 +WA +0 +0 +4 +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r +index 765bf08..bf7cf84 100644 +--- a/ld/testsuite/ld-powerpc/tlstocso.r ++++ b/ld/testsuite/ld-powerpc/tlstocso.r +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] \.opd .* + +\[[ 0-9]+\] \.got .* + +\[[ 0-9]+\] \.plt .* +- +\[[ 0-9]+\] \.shstrtab .* + +\[[ 0-9]+\] \.symtab .* + +\[[ 0-9]+\] \.strtab .* ++ +\[[ 0-9]+\] \.shstrtab .* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd +index 32c883a..b45fc29 100644 +--- a/ld/testsuite/ld-s390/tlsbin.rd ++++ b/ld/testsuite/ld-s390/tlsbin.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC .* + +\[[ 0-9]+\] .got +PROGBITS .* +- +\[[ 0-9]+\] .shstrtab .* + +\[[ 0-9]+\] .symtab .* + +\[[ 0-9]+\] .strtab .* ++ +\[[ 0-9]+\] .shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd +index 38d5789..f7caa16 100644 +--- a/ld/testsuite/ld-s390/tlsbin_64.rd ++++ b/ld/testsuite/ld-s390/tlsbin_64.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC .* + +\[[ 0-9]+\] .got +PROGBITS .* +- +\[[ 0-9]+\] .shstrtab .* + +\[[ 0-9]+\] .symtab .* + +\[[ 0-9]+\] .strtab .* ++ +\[[ 0-9]+\] .shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd +index 07d29c2..5159863 100644 +--- a/ld/testsuite/ld-s390/tlspic.rd ++++ b/ld/testsuite/ld-s390/tlspic.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS .* 0+20 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC .* + +\[[ 0-9]+\] .got +PROGBITS .* +- +\[[ 0-9]+\] .shstrtab .* + +\[[ 0-9]+\] .symtab .* + +\[[ 0-9]+\] .strtab .* ++ +\[[ 0-9]+\] .shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd +index 6197f8a..7f8dc1b 100644 +--- a/ld/testsuite/ld-s390/tlspic_64.rd ++++ b/ld/testsuite/ld-s390/tlspic_64.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS .* 0+20 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC .* + +\[[ 0-9]+\] .got +PROGBITS .* +- +\[[ 0-9]+\] .shstrtab .* + +\[[ 0-9]+\] .symtab .* + +\[[ 0-9]+\] .strtab .* ++ +\[[ 0-9]+\] .shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd +index e22d502..83c1e9b 100644 +--- a/ld/testsuite/ld-sh/sh64/crange1.rd ++++ b/ld/testsuite/ld-sh/sh64/crange1.rd +@@ -7,9 +7,9 @@ Section Headers: + +\[ 2\] \.text +PROGBITS +00001004 000084 000018 00 AXp +0 +0 +4 + +\[ 3\] \.stack +PROGBITS +00080000 000100 000004 00 +WA +0 +0 +1 + +\[ 4\] \.cranges +LOUSER\+1 +00000000 000104 00001e 00 +W +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +.* +- +\[ 6\] \.symtab +SYMTAB +.* +- +\[ 7\] \.strtab +STRTAB +.* ++ +\[ 5\] \.symtab +SYMTAB +.* ++ +\[ 6\] \.strtab +STRTAB +.* ++ +\[ 7\] \.shstrtab +STRTAB +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crange2.rd b/ld/testsuite/ld-sh/sh64/crange2.rd +index 5074087..e7416e1 100644 +--- a/ld/testsuite/ld-sh/sh64/crange2.rd ++++ b/ld/testsuite/ld-sh/sh64/crange2.rd +@@ -7,9 +7,9 @@ Section Headers: + +\[ 2\] \.text +PROGBITS +00001004 000084 00005c 00 AXp +0 +0 +4 + +\[ 3\] \.stack +PROGBITS +00080000 000100 000004 00 +WA +0 +0 +1 + +\[ 4\] \.cranges +LOUSER\+1 +00000000 000104 000046 00 +W +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +.* +- +\[ 6\] \.symtab +SYMTAB +.* +- +\[ 7\] \.strtab +STRTAB +.* ++ +\[ 5\] \.symtab +SYMTAB +.* ++ +\[ 6\] \.strtab +STRTAB +.* ++ +\[ 7\] \.shstrtab +STRTAB +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd +index d4f090e..9f5f595 100644 +--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd ++++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd +@@ -17,7 +17,7 @@ ELF Header: + +Number of program headers: +2 + +Size of section headers: +40 \(bytes\) + +Number of section headers: +8 +- +Section header string table index: 5 ++ +Section header string table index: 7 + + Section Headers: + +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al +@@ -26,9 +26,9 @@ Section Headers: + +\[ 2\] \.text +PROGBITS +00001004 000084 0000d8 00 AXp +0 +0 +4 + +\[ 3\] \.stack +PROGBITS +00080000 000180 000004 00 +WA +0 +0 +1 + +\[ 4\] \.cranges +LOUSER\+1 +00000000 000184 00003c 00 +W +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +.* +- +\[ 6\] \.symtab +SYMTAB +.* +- +\[ 7\] \.strtab +STRTAB +.* ++ +\[ 5\] \.symtab +SYMTAB +.* ++ +\[ 6\] \.strtab +STRTAB +.* ++ +\[ 7\] \.shstrtab +STRTAB +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd +index 5a856d4..926925c 100644 +--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd ++++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd +@@ -17,7 +17,7 @@ ELF Header: + +Number of program headers: +2 + +Size of section headers: +40 \(bytes\) + +Number of section headers: +8 +- +Section header string table index: 5 ++ +Section header string table index: 7 + + Section Headers: + +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al +@@ -26,9 +26,9 @@ Section Headers: + +\[ 2\] \.text +PROGBITS +00001004 000084 0000d8 00 AXp +0 +0 +4 + +\[ 3\] \.stack +PROGBITS +00080000 000180 000004 00 +WA +0 +0 +1 + +\[ 4\] \.cranges +LOUSER\+1 +00000000 000184 00003c 00 +W +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +.* +- +\[ 6\] \.symtab +SYMTAB +.* +- +\[ 7\] \.strtab +STRTAB +.* ++ +\[ 5\] \.symtab +SYMTAB +.* ++ +\[ 6\] \.strtab +STRTAB +.* ++ +\[ 7\] \.shstrtab +STRTAB +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crange3.rd b/ld/testsuite/ld-sh/sh64/crange3.rd +index b495861..8870e0b 100644 +--- a/ld/testsuite/ld-sh/sh64/crange3.rd ++++ b/ld/testsuite/ld-sh/sh64/crange3.rd +@@ -7,9 +7,9 @@ Section Headers: + +\[ 2\] \.text +PROGBITS +00001004 000084 0000d8 00 AXp +0 +0 +4 + +\[ 3\] \.stack +PROGBITS +00080000 000180 000004 00 +WA +0 +0 +1 + +\[ 4\] \.cranges +LOUSER\+1 +00000000 000184 00003c 00 +W +0 +0 +1 +- +\[ 5\] \.shstrtab +STRTAB +.* +- +\[ 6\] \.symtab +SYMTAB +.* +- +\[ 7\] \.strtab +STRTAB +.* ++ +\[ 5\] \.symtab +SYMTAB +.* ++ +\[ 6\] \.strtab +STRTAB +.* ++ +\[ 7\] \.shstrtab +STRTAB +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crangerel1.rd b/ld/testsuite/ld-sh/sh64/crangerel1.rd +index 90d71c5..3443f2a 100644 +--- a/ld/testsuite/ld-sh/sh64/crangerel1.rd ++++ b/ld/testsuite/ld-sh/sh64/crangerel1.rd +@@ -10,9 +10,9 @@ Section Headers: + +\[ 5\] \.stack +PROGBITS +00000000 00004c 000004 00 +WA +0 +0 +1 + +\[ 6\] \.cranges +PROGBITS +00000000 000050 00001e 00 +W +0 +0 +1 + +\[ 7\] \.rela\.cranges +RELA +00000000 [0-9a-f]+ 000024 0c +I +9 +6 +4 +- +\[ 8\] \.shstrtab +STRTAB +00000000 [0-9a-f]+ 00004d 00 +0 +0 +1 +- +\[ 9\] \.symtab +SYMTAB .* +- +\[10\] \.strtab +STRTAB .* ++ +\[ 8\] \.symtab +SYMTAB .* ++ +\[ 9\] \.strtab +STRTAB .* ++ +\[10\] \.shstrtab +STRTAB +00000000 [0-9a-f]+ 00004d 00 +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/sh64/crangerel2.rd b/ld/testsuite/ld-sh/sh64/crangerel2.rd +index 2daede7..a1674b5 100644 +--- a/ld/testsuite/ld-sh/sh64/crangerel2.rd ++++ b/ld/testsuite/ld-sh/sh64/crangerel2.rd +@@ -10,9 +10,9 @@ Section Headers: + +\[ 5\] \.stack +PROGBITS +00000000 000090 000004 00 +WA +0 +0 +1 + +\[ 6\] \.cranges +PROGBITS +00000000 000094 000046 00 +W +0 +0 +1 + +\[ 7\] \.rela\.cranges +RELA +00000000 [0-9a-f]+ 000054 0c +I +9 +6 +4 +- +\[ 8\] \.shstrtab +STRTAB +00000000 [0-9a-f]+ 00004d 00 +0 +0 +1 +- +\[ 9\] \.symtab +SYMTAB +00000000 [0-9a-f]+ [0-9a-f]+ 10 +10 +[0-9]+ +4 +- +\[10\] \.strtab +STRTAB +00000000 [0-9a-f]+ [0-9a-f]+ 00 +0 +0 +1 ++ +\[ 8\] \.symtab +SYMTAB +00000000 [0-9a-f]+ [0-9a-f]+ 10 +8 +[0-9]+ +4 ++ +\[ 9\] \.strtab +STRTAB +00000000 [0-9a-f]+ [0-9a-f]+ 00 +0 +0 +1 ++ +\[10\] \.shstrtab +STRTAB +00000000 [0-9a-f]+ 00004d 00 +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d +index 167270f..6958e45 100644 +--- a/ld/testsuite/ld-sh/tlsbin-2.d ++++ b/ld/testsuite/ld-sh/tlsbin-2.d +@@ -23,9 +23,9 @@ Section Headers: + #... + +\[[0-9a-f]+\] \.got +PROGBITS .* + #... +- +\[[0-9a-f]+\] \.shstrtab .* + +\[[0-9a-f]+\] \.symtab .* + +\[[0-9a-f]+\] \.strtab .* ++ +\[[0-9a-f]+\] \.shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d +index 0b47878..42baf1d 100644 +--- a/ld/testsuite/ld-sh/tlspic-2.d ++++ b/ld/testsuite/ld-sh/tlspic-2.d +@@ -22,9 +22,9 @@ Section Headers: + #... + +\[[0-9a-f]+\] \.got +PROGBITS .* + #... +- +\[[0-9a-f]+\] \.shstrtab .* + +\[[0-9a-f]+\] \.symtab .* + +\[[0-9a-f]+\] \.strtab .* ++ +\[[0-9a-f]+\] \.shstrtab .* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-sparc/gotop32.rd b/ld/testsuite/ld-sparc/gotop32.rd +index 3b5b942..1813719 100644 +--- a/ld/testsuite/ld-sparc/gotop32.rd ++++ b/ld/testsuite/ld-sparc/gotop32.rd +@@ -17,9 +17,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+12000 0+2000 0+70 08 +WA +3 +0 +4 + +\[[ 0-9]+\] .got +PROGBITS +0+12070 0+2070 0+8 04 +WA +0 +0 +4 + +\[[ 0-9]+\] .data +PROGBITS +0+13000 0+3000 0+8 00 +WA +0 +0 4096 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-sparc/gotop64.rd b/ld/testsuite/ld-sparc/gotop64.rd +index 2d3ffec..578fb2b 100644 +--- a/ld/testsuite/ld-sparc/gotop64.rd ++++ b/ld/testsuite/ld-sparc/gotop64.rd +@@ -17,9 +17,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+102000 0+2000 0+e0 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+1020e0 0+20e0 0+10 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .data +PROGBITS +0+103000 0+3000 0+8 00 +WA +0 +0 4096 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd +index 7212732..3de615f 100644 +--- a/ld/testsuite/ld-sparc/tlssunbin32.rd ++++ b/ld/testsuite/ld-sparc/tlssunbin32.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4 + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+231f4 0+31f4 0+80 08 +WA +4 +0 +4 + +\[[ 0-9]+\] .got +PROGBITS +0+23274 0+3274 0+14 04 +WA +0 +0 +4 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd +index 5480dab..2297d2e 100644 +--- a/ld/testsuite/ld-sparc/tlssunbin64.rd ++++ b/ld/testsuite/ld-sparc/tlssunbin64.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +0+202204 0+2204 0+40 00 WAT +0 +0 +4 + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+202208 0+2208 0+100 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+202308 0+2308 0+28 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is EXEC \(Executable file\) +diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd +index 21d07c0..bfb7cb8 100644 +--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd ++++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd +@@ -18,9 +18,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4 + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4 + +\[[ 0-9]+\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + Elf file type is DYN \(Shared object file\) + Entry point 0x1000 +diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd +index 6825aa9..88fe05f 100644 +--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd ++++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd +@@ -18,9 +18,9 @@ Section Headers: + +\[[ 0-9]+\] .tbss +NOBITS +0+102000 0+2000 0+24 0+ WAT +0 +0 +4 + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+102000 0+2000 0+100 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+102100 0+2100 0+38 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + Elf file type is DYN \(Shared object file\) + Entry point 0x1000 +diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd +index 4d96736..519b5df 100644 +--- a/ld/testsuite/ld-sparc/tlssunpic32.rd ++++ b/ld/testsuite/ld-sparc/tlssunpic32.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4 + +\[[ 0-9]+\] .got +PROGBITS +0+120f8 0+20f8 0+4c 04 +WA +0 +0 +4 + +\[[ 0-9]+\] .plt +.* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd +index 6f91fee..fa00bbf 100644 +--- a/ld/testsuite/ld-sparc/tlssunpic64.rd ++++ b/ld/testsuite/ld-sparc/tlssunpic64.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+102060 0+2060 0+130 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+102190 0+2190 0+98 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .plt +.* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + #... + + Elf file type is DYN \(Shared object file\) +diff --git a/ld/testsuite/ld-tic6x/common.d b/ld/testsuite/ld-tic6x/common.d +index 30521fc..f2a7b1b 100644 +--- a/ld/testsuite/ld-tic6x/common.d ++++ b/ld/testsuite/ld-tic6x/common.d +@@ -11,9 +11,9 @@ Section Headers: + \[ 0\] NULL 00000000 000000 000000 00 0 0 0 + \[ 1\] \.far NOBITS 00000080 000080 000008 00 WA 0 0 4 + \[ 2\] \.bss NOBITS 00000100 000080 000004 00 WA 0 0 4 +- \[ 3\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000025 00 0 0 1 +- \[ 4\] \.symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 5 3 4 +- \[ 5\] \.strtab STRTAB 00000000 [0-9a-f]+ 000005 00 0 0 1 ++ \[ 3\] \.symtab SYMTAB 00000000 [0-9a-f]+ 000050 10 4 3 4 ++ \[ 4\] \.strtab STRTAB 00000000 [0-9a-f]+ 000005 00 0 0 1 ++ \[ 5\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000025 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd +index a07ddca..77ec3d7 100644 +--- a/ld/testsuite/ld-tic6x/shlib-1.rd ++++ b/ld/testsuite/ld-tic6x/shlib-1.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 + \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd +index a07ddca..77ec3d7 100644 +--- a/ld/testsuite/ld-tic6x/shlib-1b.rd ++++ b/ld/testsuite/ld-tic6x/shlib-1b.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 + \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd +index a07ddca..77ec3d7 100644 +--- a/ld/testsuite/ld-tic6x/shlib-1r.rd ++++ b/ld/testsuite/ld-tic6x/shlib-1r.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 + \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd +index a07ddca..77ec3d7 100644 +--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd ++++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 + \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd +index f0e67c9..c3ddcd3 100644 +--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd ++++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd +@@ -17,9 +17,9 @@ Section Headers: + \[12\] \.neardata PROGBITS 100000c0 0020c0 00000c 00 WA 0 0 4 + \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 +- \[15\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 +- \[16\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 17 [0-9]+ 4 +- \[17\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 ++ \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[17\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd +index 19a7371..2f9d0f6 100644 +--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd ++++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd +@@ -17,9 +17,9 @@ Section Headers: + \[12\] \.neardata PROGBITS 100000c0 0020c0 00000c 00 WA 0 0 4 + \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 +- \[15\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 +- \[16\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 17 [0-9]+ 4 +- \[17\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 ++ \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[17\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd +index f4fcf6b..2cf8c58 100644 +--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd ++++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 100000c0 0020c0 000004 00 WA 0 0 4 + \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd +index 3b7b6a9..3cb0256 100644 +--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd ++++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd +@@ -16,9 +16,9 @@ Section Headers: + \[11\] \.neardata PROGBITS 100000c0 0020c0 000004 00 WA 0 0 4 + \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 +- \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 +- \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 +- \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 15 [0-9]+ 4 ++ \[15\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[16\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 00007b 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd +index fa03130..0a29c63 100644 +--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd ++++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd +@@ -17,9 +17,9 @@ Section Headers: + \[12\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 + \[13\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 +- \[15\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 +- \[16\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 17 [0-9]+ 4 +- \[17\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[15\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 16 [0-9]+ 4 ++ \[16\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[17\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000080 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd +index c1bfc2f..27d2d23 100644 +--- a/ld/testsuite/ld-tic6x/static-app-1.rd ++++ b/ld/testsuite/ld-tic6x/static-app-1.rd +@@ -14,9 +14,9 @@ Section Headers: + \[ 9\] \.neardata PROGBITS 100000e0 0020e0 000014 00 WA 0 0 4 + \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 +- \[12\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 +- \[13\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 14 [0-9]+ 4 +- \[14\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[12\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 13 [0-9]+ 4 ++ \[13\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd +index c1bfc2f..27d2d23 100644 +--- a/ld/testsuite/ld-tic6x/static-app-1b.rd ++++ b/ld/testsuite/ld-tic6x/static-app-1b.rd +@@ -14,9 +14,9 @@ Section Headers: + \[ 9\] \.neardata PROGBITS 100000e0 0020e0 000014 00 WA 0 0 4 + \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 +- \[12\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 +- \[13\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 14 [0-9]+ 4 +- \[14\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[12\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 13 [0-9]+ 4 ++ \[13\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd +index af8341e..9f3ed9b 100644 +--- a/ld/testsuite/ld-tic6x/static-app-1r.rd ++++ b/ld/testsuite/ld-tic6x/static-app-1r.rd +@@ -14,9 +14,9 @@ Section Headers: + \[ 9\] \.neardata PROGBITS 100000e0 0020e0 00000c 00 WA 0 0 4 + \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 +- \[12\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 +- \[13\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 14 [0-9]+ 4 +- \[14\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[12\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 13 [0-9]+ 4 ++ \[13\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd +index af8341e..9f3ed9b 100644 +--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd ++++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd +@@ -14,9 +14,9 @@ Section Headers: + \[ 9\] \.neardata PROGBITS 100000e0 0020e0 00000c 00 WA 0 0 4 + \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 +- \[12\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 +- \[13\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 14 [0-9]+ 4 +- \[14\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[12\] \.symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 13 [0-9]+ 4 ++ \[13\] \.strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[14\] \.shstrtab STRTAB 00000000 [0-9a-f]+ 000071 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d b/ld/testsuite/ld-x86-64/ilp32-4-nacl.d +index 296c406..f560ae3 100644 +--- a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d ++++ b/ld/testsuite/ld-x86-64/ilp32-4-nacl.d +@@ -14,9 +14,9 @@ Section Headers: + +\[ 3\] \.dynsym +DYNSYM +100000dc +0+dc +0+50 +10 +A +4 +1 +4 + +\[ 4\] \.dynstr +STRTAB +1000012c +0+12c +0+19 +00 +A +0 +0 +1 + +\[ 5\] \.dynamic +DYNAMIC +10010148 +0+148 +0+58 +08 +WA +4 +0 +4 +- +\[ 6\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +0+40 +00 +0 +0 +1 +- +\[ 7\] \.symtab +SYMTAB +0+0 +[0-9a-f]+ +[0-9a-f]+ +10 +8 +[0-9] +4 +- +\[ 8\] \.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 6\] \.symtab +SYMTAB +0+0 +[0-9a-f]+ +[0-9a-f]+ +10 +7 +[0-9] +4 ++ +\[ 7\] \.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 8\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +0+40 +00 +0 +0 +1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d +index 7f1391f..658ad49 100644 +--- a/ld/testsuite/ld-x86-64/ilp32-4.d ++++ b/ld/testsuite/ld-x86-64/ilp32-4.d +@@ -13,9 +13,9 @@ Section Headers: + \[ 3\] .dynstr STRTAB 0000010c 00010c 000019 00 A 0 0 1 + \[ 4\] .text PROGBITS 00000125 000125 000001 00 AX 0 0 1 + \[ 5\] .dynamic DYNAMIC 00200128 000128 000058 08 WA 3 0 4 +- \[ 6\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000040 00 0 0 1 +- \[ 7\] .symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 8 [0-9] 4 +- \[ 8\] .strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 6\] .symtab SYMTAB 00000000 [0-9a-f]+ [0-9a-f]+ 10 7 [0-9] 4 ++ \[ 7\] .strtab STRTAB 00000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 8\] .shstrtab STRTAB 00000000 [0-9a-f]+ 000040 00 0 0 1 + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/nogot1.d b/ld/testsuite/ld-x86-64/nogot1.d +index f6c4cf1..823a28a 100644 +--- a/ld/testsuite/ld-x86-64/nogot1.d ++++ b/ld/testsuite/ld-x86-64/nogot1.d +@@ -4,5 +4,6 @@ + + #... + [ ]*\[.*\][ ]+\.dynamic[ ]+DYNAMIC.* ++#... + [ ]*\[.*\][ ]+.*STRTAB.* + #pass +diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d +index 4b81d71..07d1732 100644 +--- a/ld/testsuite/ld-x86-64/pr12718.d ++++ b/ld/testsuite/ld-x86-64/pr12718.d +@@ -9,8 +9,8 @@ Section Headers: + +\[Nr\] Name +Type +Address +Off +Size +ES +Flg +Lk +Inf +Al + +\[ 0\] +NULL +0+ +0+ +0+ +0+ +0 +0 +0 + +\[ 1\] +.text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +000006 00 +AX +0 +0 +1 +- +\[ 2\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1 +- +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 18 +4 +[0-9] +8 +- +\[ 4\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1 ++ +\[ 2\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 18 +3 +[0-9] +8 ++ +\[ 3\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1 ++ +\[ 4\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d +index 8d09616..6fe6abe 100644 +--- a/ld/testsuite/ld-x86-64/pr12921.d ++++ b/ld/testsuite/ld-x86-64/pr12921.d +@@ -11,8 +11,8 @@ Section Headers: + +\[ 1\] .text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+1 00 +AX +0 +0 +4096 + +\[ 2\] .data +PROGBITS +[0-9a-f]+ +[0-9a-f]+000 +0+28 +00 +WA +0 +0 +4096 + +\[ 3\] .bss +NOBITS +[0-9a-f]+ +[0-9a-f]+028 +0+10000 +00 +WA +0 +0 +4096 +- +\[ 4\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1 +- +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +18 +6 +[0-9] +8 +- +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 4\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +18 +5 +[0-9] +8 ++ +\[ 5\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1 ++ +\[ 6\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd +index d11988a..4e3e74a 100644 +--- a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd ++++ b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd +@@ -8,8 +8,8 @@ Section Headers: + \[ 3\] .data PROGBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 4\] .bss NOBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 5\] .foo.0 PROGBITS 0000000000000003 000043 000003 00 AXl 0 0 1 +- \[ 6\] .shstrtab STRTAB 0000000000000000 [0-9a-f]+ 000038 00 0 0 1 +- \[ 7\] .symtab SYMTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 18 8 [0-9] 8 +- \[ 8\] .strtab STRTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 6\] .symtab SYMTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 18 7 [0-9] 8 ++ \[ 7\] .strtab STRTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 8\] .shstrtab STRTAB 0000000000000000 [0-9a-f]+ 000038 00 0 0 1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-x86-64/split-by-file.rd b/ld/testsuite/ld-x86-64/split-by-file.rd +index d11988a..4e3e74a 100644 +--- a/ld/testsuite/ld-x86-64/split-by-file.rd ++++ b/ld/testsuite/ld-x86-64/split-by-file.rd +@@ -8,8 +8,8 @@ Section Headers: + \[ 3\] .data PROGBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 4\] .bss NOBITS 0000000000000000 000043 000000 00 WA 0 0 1 + \[ 5\] .foo.0 PROGBITS 0000000000000003 000043 000003 00 AXl 0 0 1 +- \[ 6\] .shstrtab STRTAB 0000000000000000 [0-9a-f]+ 000038 00 0 0 1 +- \[ 7\] .symtab SYMTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 18 8 [0-9] 8 +- \[ 8\] .strtab STRTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 6\] .symtab SYMTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 18 7 [0-9] 8 ++ \[ 7\] .strtab STRTAB 0000000000000000 [0-9a-f]+ [0-9a-f]+ 00 0 0 1 ++ \[ 8\] .shstrtab STRTAB 0000000000000000 [0-9a-f]+ 000038 00 0 0 1 + Key to Flags: + #pass +diff --git a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd b/ld/testsuite/ld-x86-64/tlsbin-nacl.rd +index 5de5e1a..4284644 100644 +--- a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlsbin-nacl.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10030410 [0-9a-f]+ 0+140 10 +WA +6 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+10030550 [0-9a-f]+ 0+20 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+10030570 [0-9a-f]+ 0+20 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd +index 6f73b98..a34775d 100644 +--- a/ld/testsuite/ld-x86-64/tlsbin.rd ++++ b/ld/testsuite/ld-x86-64/tlsbin.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601298 0+1298 0+140 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+6013d8 0+13d8 0+20 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+6013f8 0+13f8 0+20 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd b/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd +index 110927b..1f5b782 100644 +--- a/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10030410 [0-9a-f]+ 0+100 10 +WA +5 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+10030510 [0-9a-f]+ 0+28 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+10030538 [0-9a-f]+ 0+18 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsbin2.rd b/ld/testsuite/ld-x86-64/tlsbin2.rd +index b283648..5fb1599 100644 +--- a/ld/testsuite/ld-x86-64/tlsbin2.rd ++++ b/ld/testsuite/ld-x86-64/tlsbin2.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601298 0+1298 0+100 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+601398 0+1398 0+28 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+6013c0 0+13c0 0+18 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd +index 39a5abe..2c046f4 100644 +--- a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100303d0 0+3d0 0+100 10 +WA +5 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+100304d0 0+4d0 0+20 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+100304f0 0+4f0 0+18 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd +index 8c9a342..c94014a 100644 +--- a/ld/testsuite/ld-x86-64/tlsbindesc.rd ++++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd +@@ -21,9 +21,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601260 0+1260 0+100 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+601360 0+1360 0+20 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+601380 0+1380 0+18 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd +index db196a5..7c9d77a 100644 +--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100104b0 [0-9a-f]+ 0+150 10 +WA +5 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+10010600 [0-9a-f]+ 0+48 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+10010648 [0-9a-f]+ 0+68 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd +index 6a636a0..18060c0 100644 +--- a/ld/testsuite/ld-x86-64/tlsdesc.rd ++++ b/ld/testsuite/ld-x86-64/tlsdesc.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+2011b8 0+11b8 0+150 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+201308 0+1308 0+48 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+201350 0+1350 0+68 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd +index 8614af5..934ba03 100644 +--- a/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlsgdesc.rd b/ld/testsuite/ld-x86-64/tlsgdesc.rd +index 5d845c7..729d12e6 100644 +--- a/ld/testsuite/ld-x86-64/tlsgdesc.rd ++++ b/ld/testsuite/ld-x86-64/tlsgdesc.rd +@@ -19,9 +19,9 @@ Section Headers: + +\[[ 0-9]+\] \.dynamic +.* + +\[[ 0-9]+\] \.got +.* + +\[[ 0-9]+\] \.got.plt +.* +- +\[[ 0-9]+\] \.shstrtab +.* + +\[[ 0-9]+\] \.symtab +.* + +\[[ 0-9]+\] \.strtab +.* ++ +\[[ 0-9]+\] \.shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlspic-nacl.rd b/ld/testsuite/ld-x86-64/tlspic-nacl.rd +index f98e39b..740e399 100644 +--- a/ld/testsuite/ld-x86-64/tlspic-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlspic-nacl.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10010510 [0-9a-f]+ 0+130 10 +WA +5 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+10010640 [0-9a-f]+ 0+90 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+100106d0 [0-9a-f]+ 0+20 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd +index 589666b..3f5d544 100644 +--- a/ld/testsuite/ld-x86-64/tlspic.rd ++++ b/ld/testsuite/ld-x86-64/tlspic.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+201380 0+1380 0+130 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+2014b0 0+14b0 0+90 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+201540 0+1540 0+20 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlspic2-nacl.rd b/ld/testsuite/ld-x86-64/tlspic2-nacl.rd +index 1919b3f..cbc0a75 100644 +--- a/ld/testsuite/ld-x86-64/tlspic2-nacl.rd ++++ b/ld/testsuite/ld-x86-64/tlspic2-nacl.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10010528 [0-9a-f]+ 0+130 10 +WA +5 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+10010658 [0-9a-f]+ 0+98 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+100106f0 [0-9a-f]+ 0+20 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-x86-64/tlspic2.rd b/ld/testsuite/ld-x86-64/tlspic2.rd +index 3c7b8c1..684ae21 100644 +--- a/ld/testsuite/ld-x86-64/tlspic2.rd ++++ b/ld/testsuite/ld-x86-64/tlspic2.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+201380 0+1380 0+100 10 +WA +3 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+201480 0+1480 0+98 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+201518 0+1518 0+18 08 +WA +0 +0 +8 +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-xtensa/tlsbin.rd b/ld/testsuite/ld-xtensa/tlsbin.rd +index 2361139..dcd2b04 100644 +--- a/ld/testsuite/ld-xtensa/tlsbin.rd ++++ b/ld/testsuite/ld-xtensa/tlsbin.rd +@@ -22,9 +22,9 @@ Section Headers: + +\[[ 0-9]+\] .xtensa.info +NOTE +0+ .* + +\[[ 0-9]+\] .xt.lit +PROGBITS +0+ .* + +\[[ 0-9]+\] .xt.prop +PROGBITS +0+ .* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + +diff --git a/ld/testsuite/ld-xtensa/tlspic.rd b/ld/testsuite/ld-xtensa/tlspic.rd +index 379334c..b6f7067 100644 +--- a/ld/testsuite/ld-xtensa/tlspic.rd ++++ b/ld/testsuite/ld-xtensa/tlspic.rd +@@ -23,9 +23,9 @@ Section Headers: + +\[[ 0-9]+\] .xtensa.info +NOTE +0+ .* + +\[[ 0-9]+\] .xt.lit +PROGBITS +0+ .* + +\[[ 0-9]+\] .xt.prop +PROGBITS +0+ .* +- +\[[ 0-9]+\] .shstrtab +.* + +\[[ 0-9]+\] .symtab +.* + +\[[ 0-9]+\] .strtab +.* ++ +\[[ 0-9]+\] .shstrtab +.* + Key to Flags: + #... + diff --git a/binutils.changes b/binutils.changes index ef9ef7e..769fd10 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/binutils.spec b/binutils.spec index 8359c44..c41a834 100644 --- a/binutils.spec +++ b/binutils.spec @@ -96,6 +96,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -171,6 +174,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -181,10 +186,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-aarch64-binutils.changes +++ b/cross-aarch64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec index 2e675ec..c1e568d 100644 --- a/cross-aarch64-binutils.spec +++ b/cross-aarch64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index 68cdbe7..e24c7a1 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-avr-binutils.changes +++ b/cross-avr-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec index 3a59030..9c7548c 100644 --- a/cross-avr-binutils.spec +++ b/cross-avr-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-epiphany-binutils.changes +++ b/cross-epiphany-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec index 8619faa..55494e3 100644 --- a/cross-epiphany-binutils.spec +++ b/cross-epiphany-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index cadb2cf..2498fce 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index dd52a34..9a076bb 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index 8b6270c..4e5a9ce 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index 8b2445c..3973726 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-m68k-binutils.changes +++ b/cross-m68k-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec index 55343ce..78b1f1a 100644 --- a/cross-m68k-binutils.spec +++ b/cross-m68k-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index cb715b0..4860931 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index e7ebc38..64171cc 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index 0c18ffa..3b7996e 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-ppc64le-binutils.changes +++ b/cross-ppc64le-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec index decdc44..5bf1d0c 100644 --- a/cross-ppc64le-binutils.spec +++ b/cross-ppc64le-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-rx-binutils.changes +++ b/cross-rx-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec index e15f2d8..f7fcd9f 100644 --- a/cross-rx-binutils.spec +++ b/cross-rx-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index 634ddc7..c3aa389 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index 12d7aa8..aca0a19 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index eb1b460..48a4e80 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-sparc64-binutils.changes +++ b/cross-sparc64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec index 359072d..31920de 100644 --- a/cross-sparc64-binutils.spec +++ b/cross-sparc64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index 07e08cb..f03ddb5 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index ef9ef7e..769fd10 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:55:02 UTC 2016 - idonmez@suse.com + +- Add refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch + from upstream to fix an assembler problem with clang on ARM. + Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=20648 + +------------------------------------------------------------------- +Mon Nov 28 13:16:47 UTC 2016 - rguenther@suse.com + +- Update binutils-2.27-branch.diff to include recent fixes from the branch. +- Add binutils-2.27-fix-section-order.diff to restore monotonically + increasing section offsets. + +------------------------------------------------------------------- +Tue Oct 4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the + length of the argument list is no longer limited to 128 kByte. + ------------------------------------------------------------------- Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 1d08f4b..52cb163 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -99,6 +99,9 @@ Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch22: binutils-bfd_h.patch +# Backport dd90581873482f67922 +Patch23: binutils-2.27-fix-section-order.diff +Patch24: refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch Patch34: aarch64-common-pagesize.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch @@ -174,6 +177,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch22 +%patch23 -p1 +%patch24 -p1 %patch34 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h @@ -184,10 +189,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -%if 0%{?qemu_user_space_build} -# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long) -sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in} -%endif %build sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch b/refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch new file mode 100644 index 0000000..188ef56 --- /dev/null +++ b/refine_.cfi_sections_check_to_only_consider_compact_eh_frame.patch @@ -0,0 +1,94 @@ +From 3d3424e9a8d6ad56160b98bf6e223c0346164468 Mon Sep 17 00:00:00 2001 +From: Matthew Fortune +Date: Thu, 29 Sep 2016 11:13:46 +0100 +Subject: [PATCH] Refine .cfi_sections check to only consider compact eh_frame + +The .cfi_sections directive can be safely used multiple times +with different sections named at any time unless the compact form +of exception handling is requested after CFI information has +been emitted. Only the compact form of CFI information changes +the way in which CFI is generated and therefore cannot be +retrospectively requested after generating CFI information. + +gas/ + + PR gas/20648 + * dw2gencfi.c (dot_cfi_sections): Refine the check for + inconsistent .cfi_sections to only consider compact vs non + compact forms. + * testsuite/gas/cfi/cfi-common-9.d: New file. + * testsuite/gas/cfi/cfi-common-9.s: New file. + * testsuite/gas/cfi/cfi.exp: Run new test. +--- + gas/ChangeLog | 10 ++++++++++ + gas/dw2gencfi.c | 5 ++++- + gas/testsuite/gas/cfi/cfi-common-9.d | 23 +++++++++++++++++++++++ + gas/testsuite/gas/cfi/cfi-common-9.s | 4 ++++ + gas/testsuite/gas/cfi/cfi.exp | 1 + + 5 files changed, 42 insertions(+), 1 deletions(-) + create mode 100644 gas/testsuite/gas/cfi/cfi-common-9.d + create mode 100644 gas/testsuite/gas/cfi/cfi-common-9.s + +Index: binutils-2.27/gas/dw2gencfi.c +=================================================================== +--- binutils-2.27.orig/gas/dw2gencfi.c ++++ binutils-2.27/gas/dw2gencfi.c +@@ -1244,7 +1244,10 @@ dot_cfi_sections (int ignored ATTRIBUTE_ + } + + demand_empty_rest_of_line (); +- if (cfi_sections_set && cfi_sections != sections) ++ if (cfi_sections_set ++ && (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)) ++ && (cfi_sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)) ++ != (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))) + as_bad (_("inconsistent uses of .cfi_sections")); + cfi_sections = sections; + } +Index: binutils-2.27/gas/testsuite/gas/cfi/cfi-common-9.d +=================================================================== +--- /dev/null ++++ binutils-2.27/gas/testsuite/gas/cfi/cfi-common-9.d +@@ -0,0 +1,23 @@ ++#objdump: -Wf ++#name: CFI common 9 ++#... ++Contents of the .eh_frame section: ++ ++00000000 0+0010 0+0000 CIE ++ Version: 1 ++ Augmentation: "zR" ++ Code alignment factor: .* ++ Data alignment factor: .* ++ Return address column: .* ++ Augmentation data: [01]b ++ ++ DW_CFA_nop ++ DW_CFA_nop ++ DW_CFA_nop ++ ++00000014 0+00(10|18|1c|20) 0+0018 FDE cie=0+0000 pc=.* ++ ++ DW_CFA_nop ++ DW_CFA_nop ++ DW_CFA_nop ++#... +Index: binutils-2.27/gas/testsuite/gas/cfi/cfi-common-9.s +=================================================================== +--- /dev/null ++++ binutils-2.27/gas/testsuite/gas/cfi/cfi-common-9.s +@@ -0,0 +1,4 @@ ++ .cfi_sections .eh_frame ++ .cfi_startproc simple ++ .cfi_sections .debug_frame ++ .cfi_endproc +Index: binutils-2.27/gas/testsuite/gas/cfi/cfi.exp +=================================================================== +--- binutils-2.27.orig/gas/testsuite/gas/cfi/cfi.exp ++++ binutils-2.27/gas/testsuite/gas/cfi/cfi.exp +@@ -135,4 +135,5 @@ if { ![istarget "hppa64*-*"] } then { + run_dump_test "cfi-common-6" + } + run_dump_test "cfi-common-7" ++ run_dump_test "cfi-common-9" + }