* expr.c (operator): Allow "!=" as a synonym for "<>".

* doc/as.texinfo (Infix Op): Mention "!=".

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3ee3d630c84d1e5b74979965fa7b075ccaa8c66a..df3ac710c0c272341550b135e1840fb134db5a85 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-10  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+       * expr.c (operator): Allow "!=" as a synonym for "<>".
+       * doc/as.texinfo (Infix Op): Mention "!=".
+
 2005-10-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * config/tc-hppa.c (strict): Don't initialize.  Update comment.

diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index dfa9cb8376b9a42f1924c733546c5580f856c6b3..1d9ae0c269f7523851a947167d3f3f713f40e27f 100644 (file)
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -3619,6 +3619,7 @@ You may not subtract arguments from different sections.
 @item  ==
 @dfn{Is Equal To}
 @item <>
+@itemx !=
 @dfn{Is Not Equal To}
 @item <
 @dfn{Is Less Than}

diff --git a/gas/expr.c b/gas/expr.c
index 7e37010949d9f2bc277465ff48665560974a8c94..fff0fde707539911ecc0ad35e8fc8cd97978c76f 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1587,15 +1587,21 @@ operator (int *num_chars)
       return ret;
 
     case '!':
-      /* We accept !! as equivalent to ^ for MRI compatibility.  */
-      if (input_line_pointer[1] != '!')
+      switch (input_line_pointer[1])
        {
+       case '!':
+         /* We accept !! as equivalent to ^ for MRI compatibility. */
+         *num_chars = 2;
+         return O_bit_exclusive_or;
+       case '=':
+         /* We accept != as equivalent to <>.  */
+         *num_chars = 2;
+         return O_ne;
+       default:
          if (flag_m68k_mri)
            return O_bit_inclusive_or;
          return op_encoding[c];
        }
-      *num_chars = 2;
-      return O_bit_exclusive_or;
 
     case '|':
       if (input_line_pointer[1] != '|')