diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/config/tc-epiphany.c | 2 | ||||
| -rw-r--r-- | gas/config/tc-epiphany.h | 1 | ||||
| -rw-r--r-- | gas/config/tc-ip2k.c | 2 | ||||
| -rw-r--r-- | gas/config/tc-ip2k.h | 1 | ||||
| -rw-r--r-- | gas/config/tc-mt.c | 2 | ||||
| -rw-r--r-- | gas/config/tc-mt.h | 1 | ||||
| -rw-r--r-- | gas/expr.c | 19 | ||||
| -rw-r--r-- | gas/expr.h | 2 |
8 files changed, 21 insertions, 9 deletions
diff --git a/gas/config/tc-epiphany.c b/gas/config/tc-epiphany.c index ca24520..3117918 100644 --- a/gas/config/tc-epiphany.c +++ b/gas/config/tc-epiphany.c @@ -145,6 +145,8 @@ md_begin (void) /* Set the machine type. */ bfd_default_set_arch_mach (stdoutput, bfd_arch_epiphany, bfd_mach_epiphany32); + + literal_prefix_dollar_hex = TRUE; } valueT diff --git a/gas/config/tc-epiphany.h b/gas/config/tc-epiphany.h index ace8f36..695b970 100644 --- a/gas/config/tc-epiphany.h +++ b/gas/config/tc-epiphany.h @@ -37,7 +37,6 @@ /* We don't need to handle .word strangely. */ #define WORKING_DOT_WORD -#define LITERAL_PREFIXDOLLAR_HEX #define LITERAL_PREFIXPERCENT_BIN #define DOUBLESLASH_LINE_COMMENTS diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c index ab00b05..0fcc000 100644 --- a/gas/config/tc-ip2k.c +++ b/gas/config/tc-ip2k.c @@ -160,6 +160,8 @@ md_begin (void) /* Set the machine type. */ bfd_default_set_arch_mach (stdoutput, bfd_arch_ip2k, ip2k_mach); + + literal_prefix_dollar_hex = TRUE; } diff --git a/gas/config/tc-ip2k.h b/gas/config/tc-ip2k.h index 0b38c9dc..ae9510d 100644 --- a/gas/config/tc-ip2k.h +++ b/gas/config/tc-ip2k.h @@ -38,7 +38,6 @@ /* We don't need to handle .word strangely. */ #define WORKING_DOT_WORD -#define LITERAL_PREFIXDOLLAR_HEX #define LITERAL_PREFIXPERCENT_BIN #define DOUBLESLASH_LINE_COMMENTS diff --git a/gas/config/tc-mt.c b/gas/config/tc-mt.c index b93a53e..bd51854 100644 --- a/gas/config/tc-mt.c +++ b/gas/config/tc-mt.c @@ -178,6 +178,8 @@ md_begin (void) /* Set the machine type. */ bfd_default_set_arch_mach (stdoutput, bfd_arch_mt, mt_mach); + + literal_prefix_dollar_hex = TRUE; } void diff --git a/gas/config/tc-mt.h b/gas/config/tc-mt.h index 111dadd..8a96d2c 100644 --- a/gas/config/tc-mt.h +++ b/gas/config/tc-mt.h @@ -41,7 +41,6 @@ /* All mt instructions are multiples of 32 bits. */ #define DWARF2_LINE_MIN_INSN_LENGTH 4 -#define LITERAL_PREFIXDOLLAR_HEX #define LITERAL_PREFIXPERCENT_BIN #define md_apply_fix mt_apply_fix @@ -35,6 +35,8 @@ #define CHAR_BIT 8 #endif +bfd_boolean literal_prefix_dollar_hex = FALSE; + static void floating_constant (expressionS * expressionP); static valueT generic_bignum_to_int32 (void); #ifdef BFD64 @@ -778,14 +780,19 @@ operand (expressionS *expressionP, enum expr_mode mode) expressionP); break; -#ifdef LITERAL_PREFIXDOLLAR_HEX case '$': - /* $L is the start of a local label, not a hex constant. */ - if (* input_line_pointer == 'L') - goto isname; - integer_constant (16, expressionP); + if (literal_prefix_dollar_hex) + { + /* $L is the start of a local label, not a hex constant. */ + if (* input_line_pointer == 'L') + goto isname; + integer_constant (16, expressionP); + } + else + { + goto isname; + } break; -#endif #ifdef LITERAL_PREFIXPERCENT_BIN case '%': @@ -187,3 +187,5 @@ extern symbolS *expr_build_uconstant (offsetT); extern symbolS *expr_build_dot (void); int resolve_expression (expressionS *); + +extern bfd_boolean literal_prefix_dollar_hex; |