diff options
| author | Nick Clifton <nickc@redhat.com> | 2005-10-10 15:32:44 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2005-10-10 15:32:44 +0000 |
| commit | 937a9208fe841dc96d10b278770f593de345e5df (patch) | |
| tree | 774ba4e54bd8480287e4e22024e1028728355a7a /gas | |
| parent | 3bb0a8212826fc399d04ec1e8d2882890bd980ee (diff) | |
| download | binutils-redhat-937a9208fe841dc96d10b278770f593de345e5df.tar.gz | |
* expr.c (operator): Allow "!=" as a synonym for "<>".
* doc/as.texinfo (Infix Op): Mention "!=".
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/doc/as.texinfo | 1 | ||||
| -rw-r--r-- | gas/expr.c | 14 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3ee3d630c8..df3ac710c0 100644 --- 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 dfa9cb8376..1d9ae0c269 100644 --- 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 7e37010949..fff0fde707 100644 --- 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] != '|') |