diff options
| author | Matt Jacobson <mhjacobson@me.com> | 2021-08-11 10:03:19 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2021-08-11 10:03:19 +0100 |
| commit | d86d1fc7f988f52da4711a86c078194347ab6482 (patch) | |
| tree | 1086243d3c10740164fefb19bfcacd42f72d8f6d /gas/config | |
| parent | bda3d9fbc86950e4661188161ee643f0987d032c (diff) | |
| download | gdb-d86d1fc7f988f52da4711a86c078194347ab6482.zip gdb-d86d1fc7f988f52da4711a86c078194347ab6482.tar.gz gdb-d86d1fc7f988f52da4711a86c078194347ab6482.tar.bz2 | |
Add a -mno-dollar-line-separator command line option to the AVR assembler.
Some frontends, like the gcc Objective-C frontend, emit symbols with $
characters in them. The AVR target code in gas treats $ as a line separator,
so the code doesn?t assemble correctly.
Provide a machine-specific option to disable treating $ as a line separator.
* config/tc-avr.c (enum options): Add option flag.
(struct option): Add option -mno-dollar-line-separator.
(md_parse_option): Adjust treatment of $ when option is present.
* config/tc-avr.h: Use avr_line_separator_chars.
Diffstat (limited to 'gas/config')
| -rw-r--r-- | gas/config/tc-avr.c | 14 | ||||
| -rw-r--r-- | gas/config/tc-avr.h | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c index 40dcce7..e731ea9 100644 --- a/gas/config/tc-avr.c +++ b/gas/config/tc-avr.c @@ -157,7 +157,9 @@ static struct avr_opcodes_s *avr_gccisr_opcode; const char comment_chars[] = ";"; const char line_comment_chars[] = "#"; -const char line_separator_chars[] = "$"; + +const char *avr_line_separator_chars = "$"; +static const char *avr_line_separator_chars_no_dollar = ""; const char *md_shortopts = "m:"; struct mcu_type_s @@ -565,7 +567,8 @@ enum options OPTION_ISA_RMW, OPTION_LINK_RELAX, OPTION_NO_LINK_RELAX, - OPTION_HAVE_GCCISR + OPTION_HAVE_GCCISR, + OPTION_NO_DOLLAR_LINE_SEPARATOR, }; struct option md_longopts[] = @@ -578,6 +581,7 @@ struct option md_longopts[] = { "mlink-relax", no_argument, NULL, OPTION_LINK_RELAX }, { "mno-link-relax", no_argument, NULL, OPTION_NO_LINK_RELAX }, { "mgcc-isr", no_argument, NULL, OPTION_HAVE_GCCISR }, + { "mno-dollar-line-separator", no_argument, NULL, OPTION_NO_DOLLAR_LINE_SEPARATOR }, { NULL, no_argument, NULL, 0 } }; @@ -687,6 +691,8 @@ md_show_usage (FILE *stream) " -mlink-relax generate relocations for linker relaxation (default)\n" " -mno-link-relax don't generate relocations for linker relaxation.\n" " -mgcc-isr accept the __gcc_isr pseudo-instruction.\n" + " -mno-dollar-line-separator\n" + " do not treat the $ character as a line separator.\n" )); show_mcu_list (stream); } @@ -756,6 +762,10 @@ md_parse_option (int c, const char *arg) case OPTION_HAVE_GCCISR: avr_opt.have_gccisr = 1; return 1; + case OPTION_NO_DOLLAR_LINE_SEPARATOR: + avr_line_separator_chars = avr_line_separator_chars_no_dollar; + lex_type['$'] = LEX_NAME | LEX_BEGIN_NAME; + return 1; } return 0; diff --git a/gas/config/tc-avr.h b/gas/config/tc-avr.h index 0f85099..5862697 100644 --- a/gas/config/tc-avr.h +++ b/gas/config/tc-avr.h @@ -143,7 +143,7 @@ extern int avr_force_relocation (struct fix *); would print `12 34 56 78'. The default value is 4. */ #define LISTING_WORD_SIZE 2 -/* AVR port uses `$' as a logical line separator. */ +/* AVR port uses `$' as a logical line separator by default. */ #define LEX_DOLLAR 0 /* An `.lcomm' directive with no explicit alignment parameter will @@ -244,3 +244,6 @@ struct avr_frag_data #define TC_FRAG_TYPE struct avr_frag_data #define TC_FRAG_INIT(frag, max_bytes) avr_frag_init (frag) extern void avr_frag_init (fragS *); + +#define tc_line_separator_chars avr_line_separator_chars +extern const char *avr_line_separator_chars; |