From: Nick Clifton Date: Tue, 19 Sep 2017 13:59:01 +0000 (+0100) Subject: Import xtensa patches from the mainline sources to fix name lookup and sorting. X-Git-Tag: binutils-2_29_1.1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8161f998b6c3b3d4720e8a4438cfefa67fd23a33;p=thirdparty%2Fbinutils-gdb.git Import xtensa patches from the mainline sources to fix name lookup and sorting. * xtensa-isa.c (xtensa_isa_init): Don't update lookup table entries for sysregs with negative indices. * emultempl/xtensaelf.em (xtensa_wild_group_interleave_callback): Only check for by_name sorting. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8ee7fa58ad0..f699b2ffc6f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,18 @@ +2017-09-19 Nick Clifton + + 2.29.1 Release + + * version.m4: Bump version to 2.29.1 + * configure: Regenerate. + * po/bfd.pot: Regenerate. + +2017-09-19 Nick Clifton + + Import from maiknline: + + * xtensa-isa.c (xtensa_isa_init): Don't update lookup table + entries for sysregs with negative indices. + 2017-09-19 Alan Modra PR 21441 @@ -41,14 +56,6 @@ return from bfd_canonicalize_dynamic_reloc. * elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise. -2017-09-15 Nick Clifton - - 2.29.1 Release - - * version.m4: Bump version to 2.29.1 - * configure: Regenerate. - * po/bfd.pot: Regenerate. - 2017-09-14 Nick Clifton Import from mainline: diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c index 8da75bea810..5656062646f 100644 --- a/bfd/xtensa-isa.c +++ b/bfd/xtensa-isa.c @@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) xtensa_sysreg_internal *sreg = &isa->sysregs[n]; is_user = sreg->is_user; - isa->sysreg_table[is_user][sreg->number] = n; + if (sreg->number >= 0) + isa->sysreg_table[is_user][sreg->number] = n; } /* Set up the interface lookup table. */ @@ -1790,4 +1791,3 @@ xtensa_funcUnit_num_copies (xtensa_isa isa, xtensa_funcUnit fun) CHECK_FUNCUNIT (intisa, fun, XTENSA_UNDEFINED); return intisa->funcUnits[fun].num_copies; } - diff --git a/ld/ChangeLog b/ld/ChangeLog index 65641fc5d68..058755e4751 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,18 @@ +2017-09-19 Nick Clifton + + 2.29.1 Release + + * configure: Regenerate. + * po/ld.pot: Regenerate. + +2017-09-19 Nick Clifton + + Import from mainline: + + * emultempl/xtensaelf.em (xtensa_wild_group_interleave_callback): + Only check for by_name sorting. + + 2017-08-31 Alan Modra * testsuite/ld-elf/eh3.d: Update. @@ -17,13 +32,6 @@ * testsuite/ld-x86-64/tls.exp: Require GCC 5 or above for "tlsdesc1" and "tlsdesc1 with PIE" tests. -2017-09-15 Nick Clifton - - 2.29.1 Release - - * configure: Regenerate. - * po/ld.pot: Regenerate. - 2017-08-21 Hans-Peter Nilsson Import from mainline: diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 1447d526a25..3827d91b629 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -1432,7 +1432,7 @@ xtensa_wild_group_interleave_callback (lang_statement_union_type *statement) struct wildcard_list *l; for (l = w->section_list; l != NULL; l = l->next) { - if (l->spec.sorted != none) + if (l->spec.sorted == by_name) { no_reorder = TRUE; break;