diff options
author | Alan Modra <amodra@gmail.com> | 2017-10-12 21:28:30 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2017-10-12 23:30:43 +1030 |
commit | 6c19b93bcd0d136f7be4d1e1e3f2e8d7b5917009 (patch) | |
tree | 1bed658f45d0a3648437c12080f8aec2d11278f4 /ld/ldgram.y | |
parent | 1d75a8e26e6def4f492c84a5f678e41ddebda799 (diff) | |
download | gdb-6c19b93bcd0d136f7be4d1e1e3f2e8d7b5917009.zip gdb-6c19b93bcd0d136f7be4d1e1e3f2e8d7b5917009.tar.gz gdb-6c19b93bcd0d136f7be4d1e1e3f2e8d7b5917009.tar.bz2 |
ld whitespace fixes
* pe-dll.c: Formatting, whitespace fixes.
* NEWS: Whitespace fixes.
* configure.ac: Likewise.
* configure.tgt: Likewise.
* deffilep.y: Likewise.
* genscripts.sh: Likewise.
* ld.texinfo: Likewise.
* ldgram.y: Likewise.
* ldlang.c: Likewise.
* ldlex.l: Likewise.
* lexsup.c: Likewise.
* plugin.c: Likewise.
* emulparams/arc-endianness.sh: Likewise.
* emulparams/elf32_x86_64.sh: Likewise.
* emulparams/elf64mmix.sh: Likewise.
* emulparams/elf_x86_64.sh: Likewise.
* emulparams/h8300elf.sh: Likewise.
* emulparams/h8300elf_linux.sh: Likewise.
* emulparams/vxworks.sh: Likewise.
* emultempl/aarch64elf.em: Likewise.
* emultempl/aix.em: Likewise.
* emultempl/armelf.em: Likewise.
* emultempl/avrelf.em: Likewise.
* emultempl/beos.em: Likewise.
* emultempl/hppaelf.em: Likewise.
* emultempl/m68kcoff.em: Likewise.
* emultempl/m68kelf.em: Likewise.
* emultempl/metagelf.em: Likewise.
* emultempl/msp430.em: Likewise.
* emultempl/nds32elf.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
* emultempl/sh64elf.em: Likewise.
* emultempl/spu_ovl.S: Likewise.
* emultempl/spuelf.em: Likewise.
* emultempl/tic6xdsbt.em: Likewise.
* emultempl/ticoff.em: Likewise.
* emultempl/vms.em: Likewise.
* po/Make-in: Likewise.
* scripttempl/DWARF.sc: Likewise.
* scripttempl/aix.sc: Likewise.
* scripttempl/alpha.sc: Likewise.
* scripttempl/alphavms.sc: Likewise.
* scripttempl/aout.sc: Likewise.
* scripttempl/arclinux.sc: Likewise.
* scripttempl/armaout.sc: Likewise.
* scripttempl/armbpabi.sc: Likewise.
* scripttempl/armcoff.sc: Likewise.
* scripttempl/avr.sc: Likewise.
* scripttempl/crisaout.sc: Likewise.
* scripttempl/delta68.sc: Likewise.
* scripttempl/dlx.sc: Likewise.
* scripttempl/elf.sc: Likewise.
* scripttempl/elf32cr16.sc: Likewise.
* scripttempl/elf32cr16c.sc: Likewise.
* scripttempl/elf32crx.sc: Likewise.
* scripttempl/elf32msp430.sc: Likewise.
* scripttempl/elf32msp430_3.sc: Likewise.
* scripttempl/elf32sh-symbian.sc: Likewise.
* scripttempl/elf32xc16x.sc: Likewise.
* scripttempl/elf32xc16xl.sc: Likewise.
* scripttempl/elf32xc16xs.sc: Likewise.
* scripttempl/elf64hppa.sc: Likewise.
* scripttempl/elf_chaos.sc: Likewise.
* scripttempl/elfarc.sc: Likewise.
* scripttempl/elfarcv2.sc: Likewise.
* scripttempl/elfd10v.sc: Likewise.
* scripttempl/elfd30v.sc: Likewise.
* scripttempl/elfi370.sc: Likewise.
* scripttempl/elfm68hc11.sc: Likewise.
* scripttempl/elfm68hc12.sc: Likewise.
* scripttempl/elfmicroblaze.sc: Likewise.
* scripttempl/elfxgate.sc: Likewise.
* scripttempl/elfxtensa.sc: Likewise.
* scripttempl/epiphany_4x4.sc: Likewise.
* scripttempl/epocpe.sc: Likewise.
* scripttempl/h8300.sc: Likewise.
* scripttempl/h8300h.sc: Likewise.
* scripttempl/h8300hn.sc: Likewise.
* scripttempl/h8300s.sc: Likewise.
* scripttempl/h8300sn.sc: Likewise.
* scripttempl/h8300sx.sc: Likewise.
* scripttempl/h8300sxn.sc: Likewise.
* scripttempl/h8500.sc: Likewise.
* scripttempl/h8500b.sc: Likewise.
* scripttempl/h8500c.sc: Likewise.
* scripttempl/h8500m.sc: Likewise.
* scripttempl/h8500s.sc: Likewise.
* scripttempl/hppaelf.sc: Likewise.
* scripttempl/i386beos.sc: Likewise.
* scripttempl/i386coff.sc: Likewise.
* scripttempl/i386go32.sc: Likewise.
* scripttempl/i386msdos.sc: Likewise.
* scripttempl/i860coff.sc: Likewise.
* scripttempl/i960.sc: Likewise.
* scripttempl/ia64vms.sc: Likewise.
* scripttempl/ip2k.sc: Likewise.
* scripttempl/iq2000.sc: Likewise.
* scripttempl/m68kaux.sc: Likewise.
* scripttempl/m68kcoff.sc: Likewise.
* scripttempl/m88kbcs.sc: Likewise.
* scripttempl/mcorepe.sc: Likewise.
* scripttempl/mep.sc: Likewise.
* scripttempl/mips.sc: Likewise.
* scripttempl/mipsbsd.sc: Likewise.
* scripttempl/mmo.sc: Likewise.
* scripttempl/moxie.sc: Likewise.
* scripttempl/nds32elf.sc: Likewise.
* scripttempl/nw.sc: Likewise.
* scripttempl/pe.sc: Likewise.
* scripttempl/pep.sc: Likewise.
* scripttempl/pj.sc: Likewise.
* scripttempl/ppcpe.sc: Likewise.
* scripttempl/psos.sc: Likewise.
* scripttempl/riscix.sc: Likewise.
* scripttempl/sh.sc: Likewise.
* scripttempl/sparccoff.sc: Likewise.
* scripttempl/st2000.sc: Likewise.
* scripttempl/tic30aout.sc: Likewise.
* scripttempl/tic30coff.sc: Likewise.
* scripttempl/tic4xcoff.sc: Likewise.
* scripttempl/tic54xcoff.sc: Likewise.
* scripttempl/tic80coff.sc: Likewise.
* scripttempl/v850.sc: Likewise.
* scripttempl/v850_rh850.sc: Likewise.
* scripttempl/vanilla.sc: Likewise.
* scripttempl/visium.sc: Likewise.
* scripttempl/w65.sc: Likewise.
* scripttempl/xstormy16.sc: Likewise.
* scripttempl/z80.sc: Likewise.
* scripttempl/z8000.sc: Likewise.
* configure: Regenerate.
Diffstat (limited to 'ld/ldgram.y')
-rw-r--r-- | ld/ldgram.y | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/ld/ldgram.y b/ld/ldgram.y index e2998f1..d701e07 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -199,27 +199,27 @@ mri_script_file: mri_script_lines: mri_script_lines mri_script_command NEWLINE - | + | ; mri_script_command: CHIP exp | CHIP exp ',' exp - | NAME { + | NAME { einfo(_("%P%F: unrecognised keyword in MRI style script '%s'\n"),$1); } - | LIST { + | LIST { config.map_filename = "-"; } - | ORDER ordernamelist - | ENDWORD - | PUBLIC NAME '=' exp - { mri_public($2, $4); } - | PUBLIC NAME ',' exp - { mri_public($2, $4); } - | PUBLIC NAME exp - { mri_public($2, $3); } - | FORMAT NAME + | ORDER ordernamelist + | ENDWORD + | PUBLIC NAME '=' exp + { mri_public($2, $4); } + | PUBLIC NAME ',' exp + { mri_public($2, $4); } + | PUBLIC NAME exp + { mri_public($2, $3); } + | FORMAT NAME { mri_format($2); } | SECT NAME ',' exp { mri_output_section($2, $4);} @@ -237,13 +237,13 @@ mri_script_command: { mri_alignmod($2,$4); } | ABSOLUTE mri_abs_name_list | LOAD mri_load_name_list - | NAMEWORD NAME + | NAMEWORD NAME { mri_name($2); } | ALIAS NAME ',' NAME { mri_alias($2,$4,0);} | ALIAS NAME ',' INT { mri_alias ($2, 0, (int) $4.integer); } - | BASE exp + | BASE exp { mri_base($2); } | TRUNCATE INT { mri_truncate ((unsigned int) $2.integer); } @@ -255,13 +255,13 @@ mri_script_command: { ldlex_popstate (); } | START NAME { lang_add_entry ($2, FALSE); } - | + | ; ordernamelist: - ordernamelist ',' NAME { mri_order($3); } - | ordernamelist NAME { mri_order($2); } - | + ordernamelist ',' NAME { mri_order($3); } + | ordernamelist NAME { mri_order($2); } + | ; mri_load_name_list: @@ -271,10 +271,10 @@ mri_load_name_list: ; mri_abs_name_list: - NAME - { mri_only_load($1); } + NAME + { mri_only_load($1); } | mri_abs_name_list ',' NAME - { mri_only_load($3); } + { mri_only_load($3); } ; casesymlist: @@ -302,11 +302,11 @@ script_file: { ldlex_both(); } ifile_list { ldlex_popstate(); } - ; + ; ifile_list: ifile_list ifile_p1 - | + | ; @@ -320,19 +320,19 @@ ifile_p1: | floating_point_support | statement_anywhere | version - | ';' + | ';' | TARGET_K '(' NAME ')' { lang_add_target($3); } | SEARCH_DIR '(' filename ')' { ldfile_add_library_path ($3, FALSE); } | OUTPUT '(' filename ')' { lang_add_output($3, 1); } - | OUTPUT_FORMAT '(' NAME ')' + | OUTPUT_FORMAT '(' NAME ')' { lang_add_output_format ($3, (char *) NULL, (char *) NULL, 1); } | OUTPUT_FORMAT '(' NAME ',' NAME ',' NAME ')' { lang_add_output_format ($3, $5, $7, 1); } - | OUTPUT_ARCH '(' NAME ')' + | OUTPUT_ARCH '(' NAME ')' { ldfile_set_output_arch ($3, bfd_arch_unknown); } | FORCE_COMMON_ALLOCATION { command_line.force_common_definition = TRUE ; } @@ -345,7 +345,7 @@ ifile_p1: { lang_enter_group (); } '(' input_list ')' { lang_leave_group (); } - | MAP '(' filename ')' + | MAP '(' filename ')' { lang_add_map($3); } | INCLUDE filename { ldlex_script (); ldfile_open_command_file($2); } @@ -455,7 +455,7 @@ wildcard_maybe_exclude: $$.exclude_name_list = NULL; $$.section_flag_list = NULL; } - | EXCLUDE_FILE '(' exclude_name_list ')' wildcard_name + | EXCLUDE_FILE '(' exclude_name_list ')' wildcard_name { $$.name = $5; $$.sorted = none; @@ -632,11 +632,11 @@ input_section_spec_no_keep: tmp.section_flag_list = $1; lang_add_wild (&tmp, NULL, ldgram_had_keep); } - | '[' section_name_list ']' + | '[' section_name_list ']' { lang_add_wild (NULL, $2, ldgram_had_keep); } - | sect_flags '[' section_name_list ']' + | sect_flags '[' section_name_list ']' { struct wildcard_spec tmp; tmp.name = NULL; @@ -665,13 +665,13 @@ input_section_spec: ; statement: - assignment end + assignment end | CREATE_OBJECT_SYMBOLS { - lang_add_attribute(lang_object_symbols_statement_enum); - } - | ';' - | CONSTRUCTORS + lang_add_attribute(lang_object_symbols_statement_enum); + } + | ';' + | CONSTRUCTORS { lang_add_attribute(lang_constructors_statement_enum); @@ -682,15 +682,15 @@ statement: lang_add_attribute (lang_constructors_statement_enum); } | input_section_spec - | length '(' mustbe_exp ')' - { - lang_add_data ((int) $1, $3); - } + | length '(' mustbe_exp ')' + { + lang_add_data ((int) $1, $3); + } | FILL '(' fill_exp ')' - { - lang_add_fill ($3); - } + { + lang_add_fill ($3); + } | ASSERT_K {ldlex_expression ();} '(' exp ',' NAME ')' end { ldlex_popstate (); lang_add_assignment (exp_assert ($4, $6)); } @@ -702,7 +702,7 @@ statement: statement_list: statement_list statement - | statement + | statement ; statement_list_opt: @@ -717,7 +717,7 @@ length: { $$ = $1; } | LONG { $$ = $1; } - | SHORT + | SHORT { $$ = $1; } | BYTE { $$ = $1; } @@ -733,7 +733,7 @@ fill_exp: fill_opt: '=' fill_exp { $$ = $2; } - | { $$ = (fill_type *) 0; } + | { $$ = (fill_type *) 0; } ; assign_op: @@ -741,17 +741,17 @@ assign_op: { $$ = '+'; } | MINUSEQ { $$ = '-'; } - | MULTEQ + | MULTEQ { $$ = '*'; } - | DIVEQ + | DIVEQ { $$ = '/'; } - | LSHIFTEQ + | LSHIFTEQ { $$ = LSHIFT; } - | RSHIFTEQ + | RSHIFTEQ { $$ = RSHIFT; } - | ANDEQ + | ANDEQ { $$ = '&'; } - | OREQ + | OREQ { $$ = '|'; } ; @@ -804,7 +804,7 @@ memory_spec_list: ; -memory_spec: NAME +memory_spec: NAME { region = lang_memory_region_lookup ($1, TRUE); } attributes_opt ':' origin_spec opt_comma length_spec @@ -824,7 +824,7 @@ origin_spec: ; length_spec: - LENGTH '=' mustbe_exp + LENGTH '=' mustbe_exp { region->length_exp = $3; } @@ -946,7 +946,7 @@ exp : { $$ = exp_binop (NE , $1, $3); } | exp LE exp { $$ = exp_binop (LE , $1, $3); } - | exp GE exp + | exp GE exp { $$ = exp_binop (GE , $1, $3); } | exp '<' exp { $$ = exp_binop ('<' , $1, $3); } @@ -968,7 +968,7 @@ exp : { $$ = exp_nameop (DEFINED, $3); } | INT { $$ = exp_bigintop ($1.integer, $1.str); } - | SIZEOF_HEADERS + | SIZEOF_HEADERS { $$ = exp_nameop (SIZEOF_HEADERS,0); } | ALIGNOF '(' NAME ')' @@ -993,8 +993,8 @@ exp : { $$ = exp_binop (DATA_SEGMENT_RELRO_END, $5, $3); } | DATA_SEGMENT_END '(' exp ')' { $$ = exp_unop (DATA_SEGMENT_END, $3); } - | SEGMENT_START '(' NAME ',' exp ')' - { /* The operands to the expression node are + | SEGMENT_START '(' NAME ',' exp ')' + { /* The operands to the expression node are placed in the opposite order from the way in which they appear in the script as that allows us to reuse more code in @@ -1022,9 +1022,9 @@ exp : memspec_at_opt: - AT '>' NAME { $$ = $3; } - | { $$ = 0; } - ; + AT '>' NAME { $$ = $3; } + | { $$ = 0; } + ; opt_at: AT '(' exp ')' { $$ = $3; } @@ -1053,7 +1053,7 @@ sect_constraint: | { $$ = 0; } ; -section: NAME { ldlex_expression(); } +section: NAME { ldlex_expression(); } opt_exp_with_type opt_at opt_align @@ -1067,7 +1067,7 @@ section: NAME { ldlex_expression(); } $5, $7, $4, $9, $6); } statement_list_opt - '}' { ldlex_popstate (); ldlex_expression (); } + '}' { ldlex_popstate (); ldlex_expression (); } memspec_opt memspec_at_opt phdr_opt fill_opt { ldlex_popstate (); @@ -1119,9 +1119,9 @@ type: ; atype: - '(' type ')' - | /* EMPTY */ { sectype = normal_section; } - | '(' ')' { sectype = normal_section; } + '(' type ')' + | /* EMPTY */ { sectype = normal_section; } + | '(' ')' { sectype = normal_section; } ; opt_exp_with_type: @@ -1402,7 +1402,7 @@ vers_defns: { $$ = lang_new_vers_pattern (NULL, $1, ldgram_vers_current_lang, FALSE); } - | NAME + | NAME { $$ = lang_new_vers_pattern (NULL, $1, ldgram_vers_current_lang, TRUE); } |