* expr.c (operand <case '$'>): Use DOLLAR_AMBIGU rather than flag_mri_m68k

  as condition for parsing the '$' as a prefix.
* as.h (DOLLAR_AMBIGU): Define if needed.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index cfbd5198f74752010a4c89749f1dc0fd30e564b8..9fa5735c974e32dbe180b074a56973a77596381c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-08  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+       * expr.c (operand <case '$'>): Use DOLLAR_AMBIGU rather than
+       flag_mri_m68k as condition for parsing the '$' as a prefix.
+       * as.h (DOLLAR_AMBIGU): Define if needed.
+
 2005-11-08  Nathan Sidwell  <nathan@codesourcery.com>
 
        Add ms2 support.

diff --git a/gas/as.h b/gas/as.h
index 22377b67ebbdf6e60772281225e216d0958d9841..5dad712db1962efbfbef96d8ca9e1b57551dfd67 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -586,6 +586,7 @@ int generic_force_reloc (struct fix *);
 #ifdef TC_M68K
 /* True if we are assembling in m68k MRI mode.  */
 COMMON int flag_m68k_mri;
+#define DOLLAR_AMBIGU flag_m68k_mri
 #else
 #define flag_m68k_mri 0
 #endif
@@ -596,6 +597,10 @@ COMMON unsigned int  found_comment;
 COMMON char *        found_comment_file;
 #endif
 
+#ifndef DOLLAR_AMBIGU
+#define DOLLAR_AMBIGU 0
+#endif
+
 #ifndef NUMBERS_WITH_SUFFIX
 #define NUMBERS_WITH_SUFFIX 0
 #endif

diff --git a/gas/expr.c b/gas/expr.c
index a5a77718d5de3324de87c9406e369e4c8366a841..c601b0af6986e89312ffcc6c2e018f2b328003ef 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1095,10 +1095,10 @@ operand (expressionS *expressionP, enum expr_mode mode)
       if (! flag_m68k_mri)
        goto de_fault;
 #endif
-      if (flag_m68k_mri && hex_p (*input_line_pointer))
+      if (DOLLAR_AMBIGU && hex_p (*input_line_pointer))
        {
-         /* In MRI mode, '$' is also used as the prefix for a
-            hexadecimal constant.  */
+         /* In MRI mode and on Z80, '$' is also used as the prefix
+            for a hexadecimal constant.  */
          integer_constant (16, expressionP);
          break;
        }