X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fldgram.y;h=df5c035c03a9f8c462e08c155af3253d4a48f531;hb=ba311c5b10ea387d68c63bf61de0885aa150cd69;hp=1ded4e730792ac6b05af56351040461e9e9270b9;hpb=2e53f7d6010d59f1ea82d55dbe3ba41e5c460ae3;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldgram.y b/ld/ldgram.y index 1ded4e7307..df5c035c03 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1,5 +1,5 @@ /* A YACC grammar to parse a superset of the AT&T linker scripting language. - Copyright 1991-2013 Free Software Foundation, Inc. + Copyright (C) 1991-2020 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com). This file is part of the GNU Binutils. @@ -29,6 +29,7 @@ #include "sysdep.h" #include "bfd.h" #include "bfdlink.h" +#include "ctf-api.h" #include "ld.h" #include "ldexp.h" #include "ldver.h" @@ -48,8 +49,8 @@ static enum section_type sectype; static lang_memory_region_type *region; -bfd_boolean ldgram_had_keep = FALSE; -char *ldgram_vers_current_lang = NULL; +static bfd_boolean ldgram_had_keep = FALSE; +static char *ldgram_vers_current_lang = NULL; #define ERROR_NAME_MAX 20 static char *error_names[ERROR_NAME_MAX]; @@ -92,13 +93,13 @@ static int error_index; %type opt_exp_without_type opt_subalign opt_align %type fill_opt fill_exp %type exclude_name_list -%type file_NAME_list +%type section_name_list %type sect_flag_list %type sect_flags %type memspec_opt casesymlist %type memspec_at_opt %type wildcard_name -%type wildcard_spec +%type section_name_spec filename_spec wildcard_maybe_exclude %token INT %token NAME LNAME %type length @@ -131,7 +132,7 @@ static int error_index; %token SORT_BY_INIT_PRIORITY %token '{' '}' %token SIZEOF_HEADERS OUTPUT_FORMAT FORCE_COMMON_ALLOCATION OUTPUT_ARCH -%token INHIBIT_COMMON_ALLOCATION +%token INHIBIT_COMMON_ALLOCATION FORCE_GROUP_ALLOCATION %token SEGMENT_START %token INCLUDE %token MEMORY @@ -141,7 +142,7 @@ static int error_index; %token DEFINED TARGET_K SEARCH_DIR MAP ENTRY %token NEXT %token SIZEOF ALIGNOF ADDR LOADADDR MAX_K MIN_K -%token STARTUP HLL SYSLIB FLOAT NOFLOAT NOCROSSREFS +%token STARTUP HLL SYSLIB FLOAT NOFLOAT NOCROSSREFS NOCROSSREFS_TO %token ORIGIN FILL %token LENGTH CREATE_OBJECT_SYMBOLS INPUT GROUP OUTPUT CONSTRUCTORS %token ALIGNMOD AT SUBALIGN HIDDEN PROVIDE PROVIDE_HIDDEN AS_NEEDED @@ -199,27 +200,27 @@ mri_script_file: mri_script_lines: mri_script_lines mri_script_command NEWLINE - | + | ; mri_script_command: CHIP exp | CHIP exp ',' exp - | NAME { - einfo(_("%P%F: unrecognised keyword in MRI style script '%s'\n"),$1); + | NAME { + einfo(_("%F%P: 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 +238,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 +256,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 +272,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 +303,11 @@ script_file: { ldlex_both(); } ifile_list { ldlex_popstate(); } - ; + ; ifile_list: ifile_list ifile_p1 - | + | ; @@ -320,30 +321,32 @@ 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 ; } + | FORCE_GROUP_ALLOCATION + { command_line.force_group_allocation = TRUE ; } | INHIBIT_COMMON_ALLOCATION - { command_line.inhibit_common_definition = TRUE ; } + { link_info.inhibit_common_definition = TRUE ; } | INPUT '(' input_list ')' | GROUP { 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); } @@ -353,6 +356,10 @@ ifile_p1: { lang_add_nocrossref ($3); } + | NOCROSSREFS_TO '(' nocrossref_list ')' + { + lang_add_nocrossref_to ($3); + } | EXTERN '(' extern_name_list ')' | INSERT_K AFTER NAME { lang_add_insert ($3, 0); } @@ -365,38 +372,43 @@ ifile_p1: ; input_list: + { ldlex_inputlist(); } + input_list1 + { ldlex_popstate(); } + +input_list1: NAME { lang_add_input_file($1,lang_input_file_is_search_file_enum, (char *)NULL); } - | input_list ',' NAME + | input_list1 ',' NAME { lang_add_input_file($3,lang_input_file_is_search_file_enum, (char *)NULL); } - | input_list NAME + | input_list1 NAME { lang_add_input_file($2,lang_input_file_is_search_file_enum, (char *)NULL); } | LNAME { lang_add_input_file($1,lang_input_file_is_l_enum, (char *)NULL); } - | input_list ',' LNAME + | input_list1 ',' LNAME { lang_add_input_file($3,lang_input_file_is_l_enum, (char *)NULL); } - | input_list LNAME + | input_list1 LNAME { lang_add_input_file($2,lang_input_file_is_l_enum, (char *)NULL); } | AS_NEEDED '(' { $$ = input_flags.add_DT_NEEDED_for_regular; input_flags.add_DT_NEEDED_for_regular = TRUE; } - input_list ')' + input_list1 ')' { input_flags.add_DT_NEEDED_for_regular = $3; } - | input_list ',' AS_NEEDED '(' + | input_list1 ',' AS_NEEDED '(' { $$ = input_flags.add_DT_NEEDED_for_regular; input_flags.add_DT_NEEDED_for_regular = TRUE; } - input_list ')' + input_list1 ')' { input_flags.add_DT_NEEDED_for_regular = $5; } - | input_list AS_NEEDED '(' + | input_list1 AS_NEEDED '(' { $$ = input_flags.add_DT_NEEDED_for_regular; input_flags.add_DT_NEEDED_for_regular = TRUE; } - input_list ')' + input_list1 ')' { input_flags.add_DT_NEEDED_for_regular = $4; } ; @@ -436,7 +448,7 @@ wildcard_name: } ; -wildcard_spec: +wildcard_maybe_exclude: wildcard_name { $$.name = $1; @@ -444,75 +456,70 @@ wildcard_spec: $$.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; $$.exclude_name_list = $3; $$.section_flag_list = NULL; } - | SORT_BY_NAME '(' wildcard_name ')' + ; + +filename_spec: + wildcard_maybe_exclude + | SORT_BY_NAME '(' wildcard_maybe_exclude ')' { - $$.name = $3; + $$ = $3; + $$.sorted = by_name; + } + | SORT_NONE '(' wildcard_maybe_exclude ')' + { + $$ = $3; + $$.sorted = by_none; + } + ; + +section_name_spec: + wildcard_maybe_exclude + | SORT_BY_NAME '(' wildcard_maybe_exclude ')' + { + $$ = $3; $$.sorted = by_name; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_BY_ALIGNMENT '(' wildcard_name ')' + | SORT_BY_ALIGNMENT '(' wildcard_maybe_exclude ')' { - $$.name = $3; + $$ = $3; $$.sorted = by_alignment; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_NONE '(' wildcard_name ')' + | SORT_NONE '(' wildcard_maybe_exclude ')' { - $$.name = $3; + $$ = $3; $$.sorted = by_none; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_BY_NAME '(' SORT_BY_ALIGNMENT '(' wildcard_name ')' ')' + | SORT_BY_NAME '(' SORT_BY_ALIGNMENT '(' wildcard_maybe_exclude ')' ')' { - $$.name = $5; + $$ = $5; $$.sorted = by_name_alignment; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_BY_NAME '(' SORT_BY_NAME '(' wildcard_name ')' ')' + | SORT_BY_NAME '(' SORT_BY_NAME '(' wildcard_maybe_exclude ')' ')' { - $$.name = $5; + $$ = $5; $$.sorted = by_name; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_BY_ALIGNMENT '(' SORT_BY_NAME '(' wildcard_name ')' ')' + | SORT_BY_ALIGNMENT '(' SORT_BY_NAME '(' wildcard_maybe_exclude ')' ')' { - $$.name = $5; + $$ = $5; $$.sorted = by_alignment_name; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } - | SORT_BY_ALIGNMENT '(' SORT_BY_ALIGNMENT '(' wildcard_name ')' ')' + | SORT_BY_ALIGNMENT '(' SORT_BY_ALIGNMENT '(' wildcard_maybe_exclude ')' ')' { - $$.name = $5; + $$ = $5; $$.sorted = by_alignment; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; - } - | SORT_BY_NAME '(' EXCLUDE_FILE '(' exclude_name_list ')' wildcard_name ')' - { - $$.name = $7; - $$.sorted = by_name; - $$.exclude_name_list = $5; - $$.section_flag_list = NULL; } - | SORT_BY_INIT_PRIORITY '(' wildcard_name ')' + | SORT_BY_INIT_PRIORITY '(' wildcard_maybe_exclude ')' { - $$.name = $3; + $$ = $3; $$.sorted = by_init_priority; - $$.exclude_name_list = NULL; - $$.section_flag_list = NULL; } ; @@ -587,8 +594,8 @@ exclude_name_list: } ; -file_NAME_list: - file_NAME_list opt_comma wildcard_spec +section_name_list: + section_name_list opt_comma section_name_spec { struct wildcard_list *tmp; tmp = (struct wildcard_list *) xmalloc (sizeof *tmp); @@ -597,7 +604,7 @@ file_NAME_list: $$ = tmp; } | - wildcard_spec + section_name_spec { struct wildcard_list *tmp; tmp = (struct wildcard_list *) xmalloc (sizeof *tmp); @@ -626,11 +633,11 @@ input_section_spec_no_keep: tmp.section_flag_list = $1; lang_add_wild (&tmp, NULL, ldgram_had_keep); } - | '[' file_NAME_list ']' + | '[' section_name_list ']' { lang_add_wild (NULL, $2, ldgram_had_keep); } - | sect_flags '[' file_NAME_list ']' + | sect_flags '[' section_name_list ']' { struct wildcard_spec tmp; tmp.name = NULL; @@ -639,11 +646,11 @@ input_section_spec_no_keep: tmp.section_flag_list = $1; lang_add_wild (&tmp, $3, ldgram_had_keep); } - | wildcard_spec '(' file_NAME_list ')' + | filename_spec '(' section_name_list ')' { lang_add_wild (&$1, $3, ldgram_had_keep); } - | sect_flags wildcard_spec '(' file_NAME_list ')' + | sect_flags filename_spec '(' section_name_list ')' { $2.section_flag_list = $1; lang_add_wild (&$2, $4, ldgram_had_keep); @@ -659,13 +666,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); @@ -676,15 +683,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)); } @@ -696,7 +703,7 @@ statement: statement_list: statement_list statement - | statement + | statement ; statement_list_opt: @@ -711,7 +718,7 @@ length: { $$ = $1; } | LONG { $$ = $1; } - | SHORT + | SHORT { $$ = $1; } | BYTE { $$ = $1; } @@ -727,7 +734,7 @@ fill_exp: fill_opt: '=' fill_exp { $$ = $2; } - | { $$ = (fill_type *) 0; } + | { $$ = (fill_type *) 0; } ; assign_op: @@ -735,17 +742,17 @@ assign_op: { $$ = '+'; } | MINUSEQ { $$ = '-'; } - | MULTEQ + | MULTEQ { $$ = '*'; } - | DIVEQ + | DIVEQ { $$ = '/'; } - | LSHIFTEQ + | LSHIFTEQ { $$ = LSHIFT; } - | RSHIFTEQ + | RSHIFTEQ { $$ = RSHIFT; } - | ANDEQ + | ANDEQ { $$ = '&'; } - | OREQ + | OREQ { $$ = '|'; } ; @@ -798,7 +805,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 @@ -812,15 +819,14 @@ memory_spec: NAME origin_spec: ORIGIN '=' mustbe_exp { - region->origin = exp_get_vma ($3, 0, "origin"); - region->current = region->origin; + region->origin_exp = $3; } ; length_spec: - LENGTH '=' mustbe_exp + LENGTH '=' mustbe_exp { - region->length = exp_get_vma ($3, -1, "length"); + region->length_exp = $3; } ; @@ -940,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); } @@ -962,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 ')' @@ -987,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 @@ -1016,9 +1022,9 @@ exp : memspec_at_opt: - AT '>' NAME { $$ = $3; } - | { $$ = 0; } - ; + AT '>' NAME { $$ = $3; } + | { $$ = 0; } + ; opt_at: AT '(' exp ')' { $$ = $3; } @@ -1047,7 +1053,7 @@ sect_constraint: | { $$ = 0; } ; -section: NAME { ldlex_expression(); } +section: NAME { ldlex_expression(); } opt_exp_with_type opt_at opt_align @@ -1061,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 (); @@ -1113,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: @@ -1238,7 +1244,7 @@ phdr_type: else { einfo (_("\ -%X%P:%S: unknown phdr type `%s' (try integer literal)\n"), +%X%P:%pS: unknown phdr type `%s' (try integer literal)\n"), NULL, s); $$ = exp_intop (0); } @@ -1262,7 +1268,7 @@ phdr_qualifiers: else if (strcmp ($1, "FLAGS") == 0 && $2 != NULL) $$.flags = $2; else - einfo (_("%X%P:%S: PHDRS syntax error at `%s'\n"), + einfo (_("%X%P:%pS: PHDRS syntax error at `%s'\n"), NULL, $1); } | AT '(' exp ')' phdr_qualifiers @@ -1396,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); } @@ -1471,7 +1477,7 @@ yyerror(arg) einfo (_("%P:%s: file format not recognized; treating as linker script\n"), ldlex_filename ()); if (error_index > 0 && error_index < ERROR_NAME_MAX) - einfo ("%P%F:%S: %s in %s\n", NULL, arg, error_names[error_index - 1]); + einfo ("%F%P:%pS: %s in %s\n", NULL, arg, error_names[error_index - 1]); else - einfo ("%P%F:%S: %s\n", NULL, arg); + einfo ("%F%P:%pS: %s\n", NULL, arg); }