* expr.c (op_encoding): Map '=' to O_SINGLE_EQ, if defined.

	* config/tc-z80.h: Define O_SINGLE_EQ as O_eq.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5a71bae484827317f5bf48722a1ddae6cf7da2f9..7de85364e617e865ef431cec381e79e0f9cf3b34 100644 (file)
--- 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 90073ab4ab637392d141b3d2b523988a0f318b3f..ff2c640612de896a00bcb461bcd130d6a9caacc1 100644 (file)
--- 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 0664e29d28b7c3f8864a4d30d9495a536a23a027..a5a77718d5de3324de87c9406e369e4c8366a841 100644 (file)
--- 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, __,
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,