From: Bob Wilson <bob.wilson@acm.org>
Date: Mon, 3 Apr 2006 19:11:05 +0000 (+0000)
Subject: 	* config/tc-xtensa.c (init_op_placement_info_table): Check for formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a02728c81d3e01e3faa73f7583ee48680d0a4fa8;p=binutils-gdb.git

	* config/tc-xtensa.c (init_op_placement_info_table): Check for formats
	of the same length but different numbers of slots.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0ae569df0aa..9d08f29080c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03  Sterling Augustine  <sterling@tensilica.com>
+
+	* config/tc-xtensa.c (init_op_placement_info_table): Check for formats
+	of the same length but different numbers of slots.
+
 2006-03-30  Andreas Schwab  <schwab@suse.de>
 
 	* configure.in: Fix help string for --enable-targets option.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index fd34e4b3312..d5531f6fa81 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -10852,8 +10852,11 @@ init_op_placement_info_table (void)
 		  opi->issuef++;
 		  set_bit (fmt, opi->formats);
 		  set_bit (slot, opi->slots[fmt]);
-		  /* opi->slot_count[fmt]++; */
-		  if (fmt_length < opi->narrowest_size)
+		  if (fmt_length < opi->narrowest_size
+		      || (fmt_length == opi->narrowest_size
+			  && (xtensa_format_num_slots (isa, fmt)
+			      < xtensa_format_num_slots (isa,
+							 opi->narrowest))))
 		    {
 		      opi->narrowest = fmt;
 		      opi->narrowest_size = fmt_length;