aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Darrington <john@darrington.wattle.id.au>2019-05-21 07:30:05 +0200
committerJohn Darrington <john@darrington.wattle.id.au>2019-05-21 07:30:05 +0200
commitda0523c66604dc11b8787d3e0123ea80a2503f14 (patch)
treea30c9d74f2ffda5c654301f8420d67f10d2184e8
parent302d65e0b264df2db2f42a2ef51fb9d69f3225de (diff)
downloadgdb-da0523c66604dc11b8787d3e0123ea80a2503f14.zip
gdb-da0523c66604dc11b8787d3e0123ea80a2503f14.tar.gz
gdb-da0523c66604dc11b8787d3e0123ea80a2503f14.tar.bz2
Revert "GAS: Replace macro LITERAL_PREFIXDOLLAR_HEX with a runtime value."
This reverts commit cffc205c9eaacfa312323807cd60b9d3d1c26894.
-rw-r--r--gas/config/tc-epiphany.c2
-rw-r--r--gas/config/tc-epiphany.h1
-rw-r--r--gas/config/tc-ip2k.c2
-rw-r--r--gas/config/tc-ip2k.h1
-rw-r--r--gas/config/tc-mt.c2
-rw-r--r--gas/config/tc-mt.h1
-rw-r--r--gas/expr.c19
-rw-r--r--gas/expr.h2
8 files changed, 9 insertions, 21 deletions
diff --git a/gas/config/tc-epiphany.c b/gas/config/tc-epiphany.c
index 3117918..ca24520 100644
--- a/gas/config/tc-epiphany.c
+++ b/gas/config/tc-epiphany.c
@@ -145,8 +145,6 @@ 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 695b970..ace8f36 100644
--- a/gas/config/tc-epiphany.h
+++ b/gas/config/tc-epiphany.h
@@ -37,6 +37,7 @@
/* 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 0fcc000..ab00b05 100644
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -160,8 +160,6 @@ 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 ae9510d..0b38c9dc 100644
--- a/gas/config/tc-ip2k.h
+++ b/gas/config/tc-ip2k.h
@@ -38,6 +38,7 @@
/* 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 bd51854..b93a53e 100644
--- a/gas/config/tc-mt.c
+++ b/gas/config/tc-mt.c
@@ -178,8 +178,6 @@ 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 8a96d2c..111dadd 100644
--- a/gas/config/tc-mt.h
+++ b/gas/config/tc-mt.h
@@ -41,6 +41,7 @@
/* 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
diff --git a/gas/expr.c b/gas/expr.c
index 0fab955..3efde88 100644
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -35,8 +35,6 @@
#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
@@ -780,19 +778,14 @@ operand (expressionS *expressionP, enum expr_mode mode)
expressionP);
break;
+#ifdef LITERAL_PREFIXDOLLAR_HEX
case '$':
- 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;
- }
+ /* $L is the start of a local label, not a hex constant. */
+ if (* input_line_pointer == 'L')
+ goto isname;
+ integer_constant (16, expressionP);
break;
+#endif
#ifdef LITERAL_PREFIXPERCENT_BIN
case '%':
diff --git a/gas/expr.h b/gas/expr.h
index c7d0681..a6cb5cf 100644
--- a/gas/expr.h
+++ b/gas/expr.h
@@ -187,5 +187,3 @@ extern symbolS *expr_build_uconstant (offsetT);
extern symbolS *expr_build_dot (void);
int resolve_expression (expressionS *);
-
-extern bfd_boolean literal_prefix_dollar_hex;