diff options
| author | Alan Modra <amodra@gmail.com> | 2003-07-27 11:58:28 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2003-07-27 11:58:28 +0000 |
| commit | 7e7d57681b2ef3593d29069fb0b77d7daadc3fad (patch) | |
| tree | 2398c37f556c404e3b78bd3b2113a1f34f378f36 /ld/ldgram.y | |
| parent | 5d35169e36b4fffc737ea015723e034c9efd7906 (diff) | |
| download | gdb-7e7d57681b2ef3593d29069fb0b77d7daadc3fad.zip gdb-7e7d57681b2ef3593d29069fb0b77d7daadc3fad.tar.gz gdb-7e7d57681b2ef3593d29069fb0b77d7daadc3fad.tar.bz2 | |
* ld.texinfo: Typo fixes. Document SUBALIGN.
* ldgram.y (opt_subalign): Add.
* ldlex.l (SUBALIGN): Recognize.
* ldlang.c (overlay_subalign): New var.
(lang_enter_overlay): Add subalign param.
(lang_enter_overlay_section): Pass overlay_subalign to
lang_enter_output_section_statement.
* ldlang.h (lang_enter_overlay): Update.
Diffstat (limited to 'ld/ldgram.y')
| -rw-r--r-- | ld/ldgram.y | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/ld/ldgram.y b/ld/ldgram.y index 22dbb24..9038ebc 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1,6 +1,6 @@ /* A YACC grammar to parse a superset of the AT&T linker scripting language. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002 Free Software Foundation, Inc. + 2001, 2002, 2003 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com). This file is part of GNU ld. @@ -94,7 +94,7 @@ static int error_index; } %type <etree> exp opt_exp_with_type mustbe_exp opt_at phdr_type phdr_val -%type <etree> opt_exp_without_type +%type <etree> opt_exp_without_type opt_subalign %type <fill> fill_opt fill_exp %type <name_list> exclude_name_list %type <wildcard_list> file_NAME_list @@ -142,7 +142,7 @@ static int error_index; %token STARTUP HLL SYSLIB FLOAT NOFLOAT NOCROSSREFS %token ORIGIN FILL %token LENGTH CREATE_OBJECT_SYMBOLS INPUT GROUP OUTPUT CONSTRUCTORS -%token ALIGNMOD AT PROVIDE +%token ALIGNMOD AT SUBALIGN PROVIDE %type <token> assign_op atype attributes_opt %type <name> filename %token CHIP LIST SECT ABSOLUTE LOAD NEWLINE ENDWORD ORDER NAMEWORD ASSERT_K @@ -828,31 +828,37 @@ opt_at: | { $$ = 0; } ; +opt_subalign: + SUBALIGN '(' exp ')' { $$ = $3; } + | { $$ = 0; } + ; + section: NAME { ldlex_expression(); } opt_exp_with_type - opt_at { ldlex_popstate (); ldlex_script (); } + opt_at + opt_subalign { ldlex_popstate (); ldlex_script (); } '{' { lang_enter_output_section_statement($1, $3, sectype, - 0, 0, 0, $4); + 0, 0, $5, $4); } statement_list_opt '}' { ldlex_popstate (); ldlex_expression (); } memspec_opt memspec_at_opt phdr_opt fill_opt { ldlex_popstate (); - lang_leave_output_section_statement ($14, $11, $13, $12); + lang_leave_output_section_statement ($15, $12, $14, $13); } opt_comma {} | OVERLAY { ldlex_expression (); } - opt_exp_without_type opt_nocrossrefs opt_at + opt_exp_without_type opt_nocrossrefs opt_at opt_subalign { ldlex_popstate (); ldlex_script (); } '{' { - lang_enter_overlay ($3); + lang_enter_overlay ($3, $6); } overlay_section '}' @@ -861,7 +867,7 @@ section: NAME { ldlex_expression(); } { ldlex_popstate (); lang_leave_overlay ($5, (int) $4, - $15, $12, $14, $13); + $16, $13, $15, $14); } opt_comma | /* The GROUP case is just enough to support the gcc |