gas/

2005-05-25  Jan Beulich  <jbeulich@novell.com>

	* config/tc-ia64.c (md_begin): Don't try to match slot 2 of an MLX
	template.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4158f79..751a0d0 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-25  Jan Beulich  <jbeulich@novell.com>
 
+       * config/tc-ia64.c (md_begin): Don't try to match slot 2 of an MLX
+       template.
+
+2005-05-25  Jan Beulich  <jbeulich@novell.com>
+
        * config/tc-ia64.c (ia64_gen_real_reloc_type): Also handle
        BFD_RELOC_UNUSED when determining the width of the reloc.
 

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 42c9c0b..4f2e462 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -7288,7 +7288,7 @@ md_begin ()
                {
                  if (match (t, j, 1))
                    {
-                     if (match (t, k, 2))
+                     if ((t == 2 && j == IA64_TYPE_X) || match (t, k, 2))
                        goodness = 3 + 3 + 3;
                      else
                        goodness = 3 + 3 + extra_goodness (t, 2);
@@ -7304,7 +7304,7 @@ md_begin ()
                }
              else if (match (t, i, 1))
                {
-                 if (match (t, j, 2))
+                 if ((t == 2 && i == IA64_TYPE_X) || match (t, j, 2))
                    goodness = 3 + 3;
                  else
                    goodness = 3 + extra_goodness (t, 2);