Better bundle template selection

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b4bbaae214d36bf3ecb66e71634ccefc350e989f..cfefa36184d147e4ec01d611464ca861c4dbd80c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-31  Bernd Schmidt  <bernds@redhat.co.uk>
+
+       * tc-ia64.c (extra_goodness): Only prefer F in slot 1 and B in slot 2.
+
 2000-10-30  Kazu Hirata  <kazu@hxi.com>
 
        * expr.c: Fix formatting.

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 065a0eefb2ffe6248212eb7a61b990b11148c7d6..1c0508e83ce5ea8176b9dcf78ba1618cf32551f9 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -5711,9 +5711,9 @@ match (int templ, int type, int slot)
 static inline int
 extra_goodness (int templ, int slot)
 {
-  if (match (templ, IA64_TYPE_F, slot))
+  if (slot == 1 && match (templ, IA64_TYPE_F, slot))
     return 2;
-  if (match (templ, IA64_TYPE_B, slot))
+  if (slot == 2 && match (templ, IA64_TYPE_B, slot))
     return 1;
   return 0;
 }