aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2005-11-07 02:15:47 +0000
committerAlan Modra <amodra@gmail.com>2005-11-07 02:15:47 +0000
commitfb7ccfc159511562e051e679bf046cdee0d995a7 (patch)
treebd6a672b1da712dbd5059fa873282de7781fb23b
parent0e470c55e8f94578da761b5c08201b8bb2914902 (diff)
downloadbinutils-fb7ccfc159511562e051e679bf046cdee0d995a7.zip
binutils-fb7ccfc159511562e051e679bf046cdee0d995a7.tar.gz
binutils-fb7ccfc159511562e051e679bf046cdee0d995a7.tar.bz2
* expr.c (op_encoding): Map '=' to O_SINGLE_EQ, if defined.
* config/tc-z80.h: Define O_SINGLE_EQ as O_eq.
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/tc-z80.h4
-rw-r--r--gas/expr.c5
3 files changed, 13 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5a71bae..7de8536 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,9 +1,14 @@
+2005-11-07 Arnold Metselaar <arnold.metselaar@planet.nl>
+
+ * expr.c (op_encoding): Map '=' to O_SINGLE_EQ, if defined.
+ * config/tc-z80.h: Define O_SINGLE_EQ as O_eq.
+
2005-11-07 Alan Modra <amodra@bigpond.net.au>
* macro.c (buffer_and_nest): Skip labels regardless of
NO_PSEUDO_DOT and flag_m68k_mri.
-2005-11-07 Arnold Metselaar <arnold.metselaar@planet.nl>
+2005-11-07 Arnold Metselaar <arnold.metselaar@planet.nl>
* expr.c (integer_constant): Match only 'B' as binary suffix if
NUMBERS_WITH_SUFFIX and LOCAL_LABELS_FB. Allow both 'b' and 'B'
diff --git a/gas/config/tc-z80.h b/gas/config/tc-z80.h
index 90073ab..ff2c640 100644
--- a/gas/config/tc-z80.h
+++ b/gas/config/tc-z80.h
@@ -78,10 +78,12 @@ extern int z80_optimize_expr (expressionS *, operatorT, expressionS *);
#define LISTING_WORD_SIZE 2
+/* A single '=' is accepted as a comparison operator. */
+#define O_SINGLE_EQ O_eq
+
/* A '$' is used to refer to the current location or as a hex. prefix. */
#define DOLLAR_DOT
#define DOLLAR_AMBIGU 1
-#define SINGLE_EQ_COMPARES
#define LOCAL_LABELS_FB 1
#define LITERAL_PREFIXPERCENT_BIN
#define NUMBERS_WITH_SUFFIX 1
diff --git a/gas/expr.c b/gas/expr.c
index 0664e29..a5a7771 100644
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1390,6 +1390,9 @@ clean_up_expression (expressionS *expressionP)
#undef __
#define __ O_illegal
+#ifndef O_SINGLE_EQ
+#define O_SINGLE_EQ O_illegal
+#endif
/* Maps ASCII -> operators. */
static const operatorT op_encoding[256] = {
@@ -1399,7 +1402,7 @@ static const operatorT op_encoding[256] = {
__, O_bit_or_not, __, __, __, O_modulus, O_bit_and, __,
__, __, O_multiply, O_add, __, O_subtract, __, O_divide,
__, __, __, __, __, __, __, __,
- __, __, __, __, O_lt, __, O_gt, __,
+ __, __, __, __, O_lt, O_SINGLE_EQ, O_gt, __,
__, __, __, __, __, __, __, __,
__, __, __, __, __, __, __, __,
__, __, __, __, __, __, __, __,