[binutils-gdb/binutils-2_29-branch] Import xtensa patches from the mainline sources to fix name lookup and sorting.

[Nick Clifton]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8161f998b6c3b3d4720e8a4438cfefa67fd23a33

commit 8161f998b6c3b3d4720e8a4438cfefa67fd23a33
Author: Nick Clifton <nickc@redhat.com>
Date:   Tue Sep 19 14:59:01 2017 +0100

    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:
---
 bfd/ChangeLog             | 23 +++++++++++++++--------
 bfd/xtensa-isa.c          |  4 ++--
 ld/ChangeLog              | 22 +++++++++++++++-------
 ld/emultempl/xtensaelf.em |  2 +-
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8ee7fa5..f699b2f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,18 @@
+2017-09-19  Nick Clifton  <nickc@redhat.com>
+
+	2.29.1 Release
+
+	* version.m4: Bump version to 2.29.1
+	* configure: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2017-09-19  Nick Clifton  <nickc@redhat.com>
+
+	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  <amodra@gmail.com>
 
 	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  <nickc@redhat.com>
-
-	2.29.1 Release
-
-	* version.m4: Bump version to 2.29.1
-	* configure: Regenerate.
-	* po/bfd.pot: Regenerate.
-
 2017-09-14  Nick Clifton  <nickc@redhat.com>
 
 	Import from mainline:
diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
index 8da75be..5656062 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 65641fc..058755e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,18 @@
+2017-09-19  Nick Clifton  <nickc@redhat.com>
+
+	2.29.1 Release
+
+	* configure: Regenerate.
+	* po/ld.pot: Regenerate.
+
+2017-09-19  Nick Clifton  <nickc@redhat.com>
+
+	Import from mainline:
+
+	* emultempl/xtensaelf.em (xtensa_wild_group_interleave_callback):
+	Only check for by_name sorting.
+
+
 2017-08-31  Alan Modra  <amodra@gmail.com>
 
 	* 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  <nickc@redhat.com>
-
-	2.29.1 Release
-
-	* configure: Regenerate.
-	* po/ld.pot: Regenerate.
-
 2017-08-21  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	Import from mainline:
diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
index 1447d52..3827d91 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;