summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2005-05-25 07:17:08 +0000
committerJan Beulich <jbeulich@novell.com>2005-05-25 07:17:08 +0000
commit022c1d97378f41ccdd36f8620210543b24c4115b (patch)
tree0ddf9c6cb64f99bf17fa79ef0da8679d38733e8d
parent682077ddedc9b728e3f82a864e3865e79d3521c1 (diff)
downloadbinutils-redhat-022c1d97378f41ccdd36f8620210543b24c4115b.tar.gz
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.
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-ia64.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4158f79d32..751a0d0390 100644
--- 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 42c9c0bcf9..4f2e462a8a 100644
--- 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);