* 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 0ae569df0aa4a0f5534481801fdfeb35fad8f3ea..9d08f29080cb5cb3c4bcd3687d7c4659be0f656e 100644 (file)
--- 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 fd34e4b3312f686fa2677a715836c5f64f1fa090..d5531f6fa817d1ba479a7917e36856965b73f718 100644 (file)
--- 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;