diff options
Diffstat (limited to 'elfutils/src/ldscript.c')
| -rw-r--r-- | elfutils/src/ldscript.c | 1057 |
1 files changed, 568 insertions, 489 deletions
diff --git a/elfutils/src/ldscript.c b/elfutils/src/ldscript.c index 0f70ca95..af23aa7c 100644 --- a/elfutils/src/ldscript.c +++ b/elfutils/src/ldscript.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 2.0. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,8 +45,7 @@ /* Using locations. */ #define YYLSP_NEEDED 0 -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ +/* Substitute the variable and function names. */ #define yyparse ldparse #define yylex ldlex #define yyerror lderror @@ -64,67 +63,69 @@ enum yytokentype { kADD_OP = 258, kALIGN = 259, - kENTRY = 260, - kEXCLUDE_FILE = 261, - kFILENAME = 262, - kGLOBAL = 263, - kGROUP = 264, - kID = 265, - kINPUT = 266, - kINTERP = 267, - kKEEP = 268, - kLOCAL = 269, - kMODE = 270, - kMUL_OP = 271, - kNUM = 272, - kOUTPUT_FORMAT = 273, - kPAGESIZE = 274, - kPROVIDE = 275, - kSEARCH_DIR = 276, - kSEGMENT = 277, - kSIZEOF_HEADERS = 278, - kSORT = 279, - kVERSION = 280, - kVERSION_SCRIPT = 281, - ADD_OP = 282, - MUL_OP = 283 + kAS_NEEDED = 260, + kENTRY = 261, + kEXCLUDE_FILE = 262, + kFILENAME = 263, + kGLOBAL = 264, + kGROUP = 265, + kID = 266, + kINPUT = 267, + kINTERP = 268, + kKEEP = 269, + kLOCAL = 270, + kMODE = 271, + kMUL_OP = 272, + kNUM = 273, + kOUTPUT_FORMAT = 274, + kPAGESIZE = 275, + kPROVIDE = 276, + kSEARCH_DIR = 277, + kSEGMENT = 278, + kSIZEOF_HEADERS = 279, + kSORT = 280, + kVERSION = 281, + kVERSION_SCRIPT = 282, + ADD_OP = 283, + MUL_OP = 284 }; #endif #define kADD_OP 258 #define kALIGN 259 -#define kENTRY 260 -#define kEXCLUDE_FILE 261 -#define kFILENAME 262 -#define kGLOBAL 263 -#define kGROUP 264 -#define kID 265 -#define kINPUT 266 -#define kINTERP 267 -#define kKEEP 268 -#define kLOCAL 269 -#define kMODE 270 -#define kMUL_OP 271 -#define kNUM 272 -#define kOUTPUT_FORMAT 273 -#define kPAGESIZE 274 -#define kPROVIDE 275 -#define kSEARCH_DIR 276 -#define kSEGMENT 277 -#define kSIZEOF_HEADERS 278 -#define kSORT 279 -#define kVERSION 280 -#define kVERSION_SCRIPT 281 -#define ADD_OP 282 -#define MUL_OP 283 +#define kAS_NEEDED 260 +#define kENTRY 261 +#define kEXCLUDE_FILE 262 +#define kFILENAME 263 +#define kGLOBAL 264 +#define kGROUP 265 +#define kID 266 +#define kINPUT 267 +#define kINTERP 268 +#define kKEEP 269 +#define kLOCAL 270 +#define kMODE 271 +#define kMUL_OP 272 +#define kNUM 273 +#define kOUTPUT_FORMAT 274 +#define kPAGESIZE 275 +#define kPROVIDE 276 +#define kSEARCH_DIR 277 +#define kSEGMENT 278 +#define kSIZEOF_HEADERS 279 +#define kSORT 280 +#define kVERSION 281 +#define kVERSION_SCRIPT 282 +#define ADD_OP 283 +#define MUL_OP 284 /* Copy the first part of user declarations. */ -#line 1 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 1 "/home/drepper/devel/elfutils/src/ldscript.y" /* Parser for linker scripts. - Copyright (C) 2001, 2002, 2003, 2004 Red Hat, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Red Hat, Inc. Written by Ulrich Drepper <drepper@redhat.com>, 2001. This program is Open Source software; you can redistribute it and/or @@ -170,6 +171,7 @@ static void new_segment (int mode, struct output_rule *output_rule); static struct filename_list *new_filename_listelem (const char *string); static void add_inputfiles (struct filename_list *fnames); static struct id_list *new_id_listelem (const char *str); + static struct filename_list *mark_as_needed (struct filename_list *listp); static struct version *new_version (struct id_list *local, struct id_list *global); static struct version *merge_versions (struct version *one, @@ -193,7 +195,7 @@ extern int yylex (void); #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 58 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 59 "/home/drepper/devel/elfutils/src/ldscript.y" typedef union YYSTYPE { uintmax_t num; enum expression_tag op; @@ -208,8 +210,8 @@ typedef union YYSTYPE { struct version *version; struct id_list *id_list; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 213 "ldscript.c" +/* Line 190 of yacc.c. */ +#line 215 "ldscript.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -220,8 +222,8 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 225 "ldscript.c" +/* Line 213 of yacc.c. */ +#line 227 "ldscript.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -236,14 +238,10 @@ typedef union YYSTYPE { # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# else +# define YYSTACK_ALLOC alloca # endif # endif # endif @@ -269,7 +267,7 @@ typedef union YYSTYPE { /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; }; @@ -279,7 +277,7 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -321,26 +319,26 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 30 +#define YYFINAL 32 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 198 +#define YYLAST 228 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 39 +#define YYNTOKENS 40 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 22 /* YYNRULES -- Number of rules. */ -#define YYNRULES 62 +#define YYNRULES 65 /* YYNRULES -- Number of states. */ -#define YYNSTATES 146 +#define YYNSTATES 158 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 283 +#define YYMAXUTOK 284 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -351,16 +349,16 @@ static const unsigned char yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 28, 2, - 32, 33, 30, 2, 38, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 34, - 2, 37, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 29, 2, + 33, 34, 31, 2, 39, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, + 2, 38, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 35, 27, 36, 2, 2, 2, 2, + 2, 2, 2, 36, 28, 37, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -376,7 +374,7 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 29, 31 + 25, 26, 27, 30, 32 }; #if YYDEBUG @@ -385,52 +383,53 @@ static const unsigned char yytranslate[] = static const unsigned char yyprhs[] = { 0, 0, 3, 5, 8, 11, 13, 19, 25, 31, - 37, 43, 49, 54, 59, 64, 69, 72, 74, 77, - 82, 85, 89, 96, 99, 101, 103, 108, 111, 117, - 119, 124, 129, 130, 135, 139, 143, 147, 151, 155, - 159, 161, 163, 165, 167, 171, 173, 175, 176, 179, - 181, 186, 192, 199, 202, 204, 207, 210, 214, 217, - 219, 221, 223 + 37, 43, 49, 54, 59, 64, 69, 74, 77, 79, + 82, 87, 90, 94, 101, 104, 106, 108, 113, 116, + 122, 124, 129, 134, 135, 140, 144, 148, 152, 156, + 160, 164, 166, 168, 170, 172, 177, 182, 186, 188, + 190, 191, 194, 196, 201, 207, 214, 217, 219, 222, + 225, 229, 232, 234, 236, 238 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 40, 0, -1, 41, -1, 26, 54, -1, 41, 42, - -1, 42, -1, 5, 32, 10, 33, 34, -1, 21, - 32, 59, 33, 34, -1, 19, 32, 17, 33, 34, - -1, 12, 32, 59, 33, 34, -1, 22, 15, 35, - 43, 36, -1, 22, 1, 35, 43, 36, -1, 9, - 32, 52, 33, -1, 11, 32, 52, 33, -1, 25, - 35, 54, 36, -1, 18, 32, 59, 33, -1, 43, - 44, -1, 44, -1, 45, 34, -1, 10, 35, 46, - 36, -1, 10, 34, -1, 10, 37, 51, -1, 20, - 32, 10, 37, 51, 33, -1, 46, 47, -1, 47, - -1, 48, -1, 13, 32, 48, 33, -1, 45, 34, - -1, 60, 32, 50, 49, 33, -1, 10, -1, 24, - 32, 10, 33, -1, 6, 32, 59, 33, -1, -1, - 4, 32, 51, 33, -1, 32, 51, 33, -1, 51, - 30, 51, -1, 51, 16, 51, -1, 51, 3, 51, - -1, 51, 28, 51, -1, 51, 27, 51, -1, 17, - -1, 10, -1, 23, -1, 19, -1, 52, 53, 59, - -1, 59, -1, 38, -1, -1, 54, 55, -1, 55, - -1, 35, 56, 36, 34, -1, 59, 35, 56, 36, - 34, -1, 59, 35, 56, 36, 59, 34, -1, 56, - 57, -1, 57, -1, 8, 58, -1, 14, 58, -1, - 58, 60, 34, -1, 60, 34, -1, 7, -1, 10, - -1, 59, -1, 30, -1 + 41, 0, -1, 42, -1, 27, 55, -1, 42, 43, + -1, 43, -1, 6, 33, 11, 34, 35, -1, 22, + 33, 60, 34, 35, -1, 20, 33, 18, 34, 35, + -1, 13, 33, 60, 34, 35, -1, 23, 16, 36, + 44, 37, -1, 23, 1, 36, 44, 37, -1, 10, + 33, 53, 34, -1, 12, 33, 53, 34, -1, 5, + 33, 53, 34, -1, 26, 36, 55, 37, -1, 19, + 33, 60, 34, -1, 44, 45, -1, 45, -1, 46, + 35, -1, 11, 36, 47, 37, -1, 11, 35, -1, + 11, 38, 52, -1, 21, 33, 11, 38, 52, 34, + -1, 47, 48, -1, 48, -1, 49, -1, 14, 33, + 49, 34, -1, 46, 35, -1, 61, 33, 51, 50, + 34, -1, 11, -1, 25, 33, 11, 34, -1, 7, + 33, 60, 34, -1, -1, 4, 33, 52, 34, -1, + 33, 52, 34, -1, 52, 31, 52, -1, 52, 17, + 52, -1, 52, 3, 52, -1, 52, 29, 52, -1, + 52, 28, 52, -1, 18, -1, 11, -1, 24, -1, + 20, -1, 10, 33, 53, 34, -1, 5, 33, 53, + 34, -1, 53, 54, 60, -1, 60, -1, 39, -1, + -1, 55, 56, -1, 56, -1, 36, 57, 37, 35, + -1, 60, 36, 57, 37, 35, -1, 60, 36, 57, + 37, 60, 35, -1, 57, 58, -1, 58, -1, 9, + 59, -1, 15, 59, -1, 59, 61, 35, -1, 61, + 35, -1, 8, -1, 11, -1, 60, -1, 31, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = +static const unsigned short int yyrline[] = { - 0, 128, 128, 129, 133, 134, 137, 142, 146, 151, - 156, 160, 166, 177, 179, 181, 185, 190, 194, 199, - 211, 235, 237, 241, 246, 250, 255, 262, 269, 280, - 282, 286, 289, 292, 297, 299, 305, 311, 317, 323, - 329, 334, 339, 341, 345, 351, 355, 356, 359, 364, - 368, 374, 380, 389, 391, 395, 397, 402, 408, 412, - 414, 418, 420 + 0, 130, 130, 131, 135, 136, 139, 144, 148, 153, + 158, 162, 168, 179, 181, 183, 185, 189, 194, 198, + 203, 215, 239, 241, 245, 250, 254, 259, 266, 273, + 284, 286, 290, 293, 296, 301, 303, 309, 315, 321, + 327, 333, 338, 343, 345, 349, 360, 362, 368, 372, + 373, 376, 381, 385, 391, 397, 406, 408, 412, 414, + 419, 425, 429, 431, 435, 437 }; #endif @@ -439,9 +438,9 @@ static const unsigned short yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "kADD_OP", "kALIGN", "kENTRY", - "kEXCLUDE_FILE", "kFILENAME", "kGLOBAL", "kGROUP", "kID", "kINPUT", - "kINTERP", "kKEEP", "kLOCAL", "kMODE", "kMUL_OP", "kNUM", + "$end", "error", "$undefined", "kADD_OP", "kALIGN", "kAS_NEEDED", + "kENTRY", "kEXCLUDE_FILE", "kFILENAME", "kGLOBAL", "kGROUP", "kID", + "kINPUT", "kINTERP", "kKEEP", "kLOCAL", "kMODE", "kMUL_OP", "kNUM", "kOUTPUT_FORMAT", "kPAGESIZE", "kPROVIDE", "kSEARCH_DIR", "kSEGMENT", "kSIZEOF_HEADERS", "kSORT", "kVERSION", "kVERSION_SCRIPT", "'|'", "'&'", "ADD_OP", "'*'", "MUL_OP", "'('", "')'", "';'", "'{'", "'}'", "'='", @@ -457,37 +456,37 @@ static const char *const yytname[] = # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 124, 38, 282, - 42, 283, 40, 41, 59, 123, 125, 61, 44 + 275, 276, 277, 278, 279, 280, 281, 282, 124, 38, + 283, 42, 284, 40, 41, 59, 123, 125, 61, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 39, 40, 40, 41, 41, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 43, 43, 44, 44, - 44, 45, 45, 46, 46, 47, 47, 47, 48, 49, - 49, 50, 50, 51, 51, 51, 51, 51, 51, 51, - 51, 51, 51, 51, 52, 52, 53, 53, 54, 54, - 55, 55, 55, 56, 56, 57, 57, 58, 58, 59, - 59, 60, 60 + 0, 40, 41, 41, 42, 42, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 44, 44, 45, + 45, 45, 46, 46, 47, 47, 48, 48, 48, 49, + 50, 50, 51, 51, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 53, 53, 53, 53, 54, + 54, 55, 55, 56, 56, 56, 57, 57, 58, 58, + 59, 59, 60, 60, 61, 61 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { 0, 2, 1, 2, 2, 1, 5, 5, 5, 5, - 5, 5, 4, 4, 4, 4, 2, 1, 2, 4, - 2, 3, 6, 2, 1, 1, 4, 2, 5, 1, - 4, 4, 0, 4, 3, 3, 3, 3, 3, 3, - 1, 1, 1, 1, 3, 1, 1, 0, 2, 1, - 4, 5, 6, 2, 1, 2, 2, 3, 2, 1, - 1, 1, 1 + 5, 5, 4, 4, 4, 4, 4, 2, 1, 2, + 4, 2, 3, 6, 2, 1, 1, 4, 2, 5, + 1, 4, 4, 0, 4, 3, 3, 3, 3, 3, + 3, 1, 1, 1, 1, 4, 4, 3, 1, 1, + 0, 2, 1, 4, 5, 6, 2, 1, 2, 2, + 3, 2, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -496,58 +495,60 @@ static const unsigned char yyr2[] = static const unsigned char yydefact[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 59, 60, 0, 3, 49, 0, - 1, 4, 0, 47, 45, 47, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 54, 48, 0, 0, - 12, 46, 0, 13, 0, 15, 0, 0, 0, 0, - 0, 17, 0, 0, 14, 62, 55, 61, 0, 56, - 0, 53, 0, 6, 44, 9, 8, 7, 20, 0, - 0, 0, 11, 16, 18, 10, 0, 58, 50, 0, - 60, 0, 0, 0, 24, 25, 0, 0, 41, 40, - 43, 42, 0, 21, 0, 57, 51, 0, 0, 27, - 19, 23, 32, 0, 0, 0, 0, 0, 0, 0, - 0, 52, 0, 0, 0, 0, 34, 37, 36, 39, - 38, 35, 0, 26, 0, 29, 0, 0, 33, 22, - 0, 0, 28, 31, 0, 30 + 0, 0, 0, 2, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 63, 0, 3, + 52, 0, 1, 4, 0, 0, 50, 48, 0, 50, + 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 57, 51, 0, 0, 0, 14, 49, 0, 0, + 12, 13, 0, 16, 0, 0, 0, 0, 0, 18, + 0, 0, 15, 65, 58, 64, 0, 59, 0, 56, + 0, 50, 50, 47, 6, 9, 8, 7, 21, 0, + 0, 0, 11, 17, 19, 10, 0, 61, 53, 0, + 46, 45, 63, 0, 0, 0, 25, 26, 0, 0, + 42, 41, 44, 43, 0, 22, 0, 60, 54, 0, + 0, 28, 20, 24, 33, 0, 0, 0, 0, 0, + 0, 0, 0, 55, 0, 0, 0, 0, 35, 38, + 37, 40, 39, 36, 0, 27, 0, 30, 0, 0, + 34, 23, 0, 0, 29, 32, 0, 31 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +static const short int yydefgoto[] = { - -1, 11, 12, 13, 60, 61, 62, 93, 94, 95, - 137, 124, 103, 33, 52, 27, 28, 45, 46, 66, - 67, 96 + -1, 12, 13, 14, 68, 69, 70, 105, 106, 107, + 149, 136, 115, 36, 58, 29, 30, 50, 51, 74, + 75, 108 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -41 -static const short yypact[] = +#define YYPACT_NINF -46 +static const short int yypact[] = { - 107, -28, -20, -13, 34, 77, 85, 88, 91, 33, - 38, 123, 125, -41, 117, 52, 52, 52, 52, 114, - 52, 100, 103, 38, -41, -41, 96, 38, -41, 110, - -41, -41, 115, 64, -41, 67, 116, 118, 120, 127, - 1, 1, 28, 84, 84, 36, -41, -41, 96, 128, - -41, -41, 52, -41, 129, -41, 130, 131, 105, 134, - 75, -41, 133, 79, -41, -41, 84, -41, 135, 84, - 136, -41, 41, -41, -41, -41, -41, -41, -41, 83, - 48, 151, -41, -41, -41, -41, 137, -41, -41, 44, - 138, 140, 139, 17, -41, -41, 142, 144, -41, -41, - -41, -41, 48, 54, 141, -41, -41, 143, 84, -41, - -41, -41, 162, 48, -2, 48, 48, 48, 48, 48, - 48, -41, 146, 148, 97, 6, -41, 54, 54, 58, - 53, -1, 13, -41, 52, -41, 149, 150, -41, -41, - 152, 172, -41, -41, 153, -41 + 105, -12, -1, 26, 30, 51, 81, 89, 93, 120, + 84, 4, 103, 128, -46, 14, 126, 14, 14, 135, + 135, 121, 135, 109, 116, 4, -46, -46, 87, 4, + -46, 139, -46, -46, 129, 144, 22, -46, 145, 127, + 130, 147, 148, 149, 150, 9, 9, 61, 2, 2, + 67, -46, -46, 87, 14, 14, -46, -46, 135, 143, + -46, -46, 151, -46, 152, 153, 138, 156, 5, -46, + 155, 79, -46, -46, 2, -46, 157, 2, 158, -46, + 68, 131, 133, -46, -46, -46, -46, -46, -46, 98, + 46, 169, -46, -46, -46, -46, 159, -46, -46, 78, + -46, -46, 160, 162, 161, 54, -46, -46, 164, 166, + -46, -46, -46, -46, 46, 64, 163, -46, -46, 165, + 2, -46, -46, -46, 178, 46, 0, 46, 46, 46, + 46, 46, 46, -46, 168, 170, 119, 20, -46, 64, + 64, 70, 77, 146, 24, -46, 135, -46, 171, 172, + -46, -46, 173, 180, -46, -46, 174, -46 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const short int yypgoto[] = { - -41, -41, -41, 175, 147, -40, 29, -41, 98, 76, - -41, -41, 39, 173, -41, 167, -24, 145, 15, 154, - -10, 32 + -46, -46, -46, 192, 167, 100, 18, -46, 104, 90, + -46, -46, 28, -16, -46, 186, 31, 175, -45, 176, + -11, -3 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -557,71 +558,78 @@ static const short yypgoto[] = #define YYTABLE_NINF -1 static const unsigned char yytable[] = { - 29, 115, 115, 47, 14, 34, 34, 36, 37, 115, - 39, 58, 15, 29, 116, 116, 115, 29, 47, 16, - 83, 59, 116, 83, 24, 117, 118, 90, 119, 116, - 91, 126, 29, 117, 118, 24, 119, 59, 25, 138, - 117, 118, 74, 119, 43, 24, 139, 65, 25, 43, - 44, 24, 97, 110, 25, 44, 115, 115, 98, 24, - 71, 115, 25, 26, 64, 99, 17, 100, 23, 116, - 116, 101, 70, 26, 116, 68, 68, 89, 106, 107, - 102, 117, 118, 119, 119, 58, 118, 71, 119, 58, - 24, 24, 21, 90, 25, 59, 91, 50, 86, 59, - 53, 86, 51, 59, 43, 51, 22, 135, 92, 18, - 44, 82, 1, 65, 65, 85, 2, 19, 3, 4, - 20, 136, 92, 30, 140, 5, 6, 32, 7, 8, - 1, 38, 9, 10, 2, 40, 3, 4, 41, 78, - 79, 114, 80, 5, 6, 48, 7, 8, 49, 54, - 9, 55, 125, 56, 127, 128, 129, 130, 131, 132, - 57, 104, 73, 75, 76, 77, 81, 84, 123, 87, - 88, 105, 108, 109, 112, 80, 113, 121, 120, 133, - 134, 141, 144, 142, 122, 143, 145, 31, 63, 35, - 42, 111, 0, 72, 0, 0, 0, 0, 69 + 31, 39, 40, 127, 37, 79, 37, 37, 41, 42, + 26, 44, 26, 27, 31, 27, 66, 128, 31, 34, + 66, 15, 26, 127, 35, 27, 67, 127, 129, 130, + 67, 131, 16, 73, 138, 79, 31, 128, 81, 82, + 28, 128, 92, 37, 37, 76, 76, 83, 129, 130, + 109, 131, 129, 130, 150, 131, 56, 110, 151, 17, + 52, 57, 26, 18, 111, 102, 112, 127, 103, 26, + 113, 96, 27, 127, 96, 67, 48, 48, 52, 114, + 127, 128, 49, 49, 19, 73, 26, 128, 119, 27, + 66, 122, 129, 130, 128, 131, 48, 28, 72, 130, + 67, 131, 49, 32, 78, 99, 26, 104, 131, 102, + 1, 2, 103, 118, 20, 3, 95, 4, 5, 67, + 25, 23, 21, 104, 6, 7, 22, 8, 9, 73, + 147, 10, 11, 1, 2, 152, 24, 38, 3, 43, + 4, 5, 126, 26, 148, 45, 27, 6, 7, 127, + 8, 9, 46, 137, 10, 139, 140, 141, 142, 143, + 144, 60, 54, 128, 61, 100, 57, 101, 93, 57, + 57, 93, 57, 88, 89, 53, 90, 55, 84, 59, + 116, 62, 63, 64, 65, 135, 85, 86, 87, 91, + 94, 156, 97, 98, 117, 120, 121, 124, 90, 125, + 133, 132, 145, 146, 153, 33, 154, 155, 157, 123, + 134, 47, 0, 71, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 0, 0, 80 }; -static const short yycheck[] = +static const short int yycheck[] = { - 10, 3, 3, 27, 32, 15, 16, 17, 18, 3, - 20, 10, 32, 23, 16, 16, 3, 27, 42, 32, - 60, 20, 16, 63, 7, 27, 28, 10, 30, 16, - 13, 33, 42, 27, 28, 7, 30, 20, 10, 33, - 27, 28, 52, 30, 8, 7, 33, 30, 10, 8, - 14, 7, 4, 36, 10, 14, 3, 3, 10, 7, - 45, 3, 10, 35, 36, 17, 32, 19, 35, 16, - 16, 23, 36, 35, 16, 43, 44, 36, 34, 89, - 32, 27, 28, 30, 30, 10, 28, 72, 30, 10, - 7, 7, 1, 10, 10, 20, 13, 33, 66, 20, - 33, 69, 38, 20, 8, 38, 15, 10, 79, 32, - 14, 36, 5, 30, 30, 36, 9, 32, 11, 12, - 32, 24, 93, 0, 134, 18, 19, 10, 21, 22, - 5, 17, 25, 26, 9, 35, 11, 12, 35, 34, - 35, 102, 37, 18, 19, 35, 21, 22, 33, 33, - 25, 33, 113, 33, 115, 116, 117, 118, 119, 120, - 33, 10, 34, 34, 34, 34, 32, 34, 6, 34, - 34, 34, 32, 34, 32, 37, 32, 34, 37, 33, - 32, 32, 10, 33, 108, 33, 33, 12, 41, 16, - 23, 93, -1, 48, -1, -1, -1, -1, 44 + 11, 17, 18, 3, 15, 50, 17, 18, 19, 20, + 8, 22, 8, 11, 25, 11, 11, 17, 29, 5, + 11, 33, 8, 3, 10, 11, 21, 3, 28, 29, + 21, 31, 33, 31, 34, 80, 47, 17, 54, 55, + 36, 17, 37, 54, 55, 48, 49, 58, 28, 29, + 4, 31, 28, 29, 34, 31, 34, 11, 34, 33, + 29, 39, 8, 33, 18, 11, 20, 3, 14, 8, + 24, 74, 11, 3, 77, 21, 9, 9, 47, 33, + 3, 17, 15, 15, 33, 31, 8, 17, 99, 11, + 11, 37, 28, 29, 17, 31, 9, 36, 37, 29, + 21, 31, 15, 0, 37, 37, 8, 89, 31, 11, + 5, 6, 14, 35, 33, 10, 37, 12, 13, 21, + 36, 1, 33, 105, 19, 20, 33, 22, 23, 31, + 11, 26, 27, 5, 6, 146, 16, 11, 10, 18, + 12, 13, 114, 8, 25, 36, 11, 19, 20, 3, + 22, 23, 36, 125, 26, 127, 128, 129, 130, 131, + 132, 34, 33, 17, 34, 34, 39, 34, 68, 39, + 39, 71, 39, 35, 36, 36, 38, 33, 35, 34, + 11, 34, 34, 34, 34, 7, 35, 35, 35, 33, + 35, 11, 35, 35, 35, 33, 35, 33, 38, 33, + 35, 38, 34, 33, 33, 13, 34, 34, 34, 105, + 120, 25, -1, 46, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 49, -1, -1, 53 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 5, 9, 11, 12, 18, 19, 21, 22, 25, - 26, 40, 41, 42, 32, 32, 32, 32, 32, 32, - 32, 1, 15, 35, 7, 10, 35, 54, 55, 59, - 0, 42, 10, 52, 59, 52, 59, 59, 17, 59, - 35, 35, 54, 8, 14, 56, 57, 55, 35, 33, - 33, 38, 53, 33, 33, 33, 33, 33, 10, 20, - 43, 44, 45, 43, 36, 30, 58, 59, 60, 58, - 36, 57, 56, 34, 59, 34, 34, 34, 34, 35, - 37, 32, 36, 44, 34, 36, 60, 34, 34, 36, - 10, 13, 45, 46, 47, 48, 60, 4, 10, 17, - 19, 23, 32, 51, 10, 34, 34, 59, 32, 34, - 36, 47, 32, 32, 51, 3, 16, 27, 28, 30, - 37, 34, 48, 6, 50, 51, 33, 51, 51, 51, - 51, 51, 51, 33, 32, 10, 24, 49, 33, 33, - 59, 32, 33, 33, 10, 33 + 0, 5, 6, 10, 12, 13, 19, 20, 22, 23, + 26, 27, 41, 42, 43, 33, 33, 33, 33, 33, + 33, 33, 33, 1, 16, 36, 8, 11, 36, 55, + 56, 60, 0, 43, 5, 10, 53, 60, 11, 53, + 53, 60, 60, 18, 60, 36, 36, 55, 9, 15, + 57, 58, 56, 36, 33, 33, 34, 39, 54, 34, + 34, 34, 34, 34, 34, 34, 11, 21, 44, 45, + 46, 44, 37, 31, 59, 60, 61, 59, 37, 58, + 57, 53, 53, 60, 35, 35, 35, 35, 35, 36, + 38, 33, 37, 45, 35, 37, 61, 35, 35, 37, + 34, 34, 11, 14, 46, 47, 48, 49, 61, 4, + 11, 18, 20, 24, 33, 52, 11, 35, 35, 60, + 33, 35, 37, 48, 33, 33, 52, 3, 17, 28, + 29, 31, 38, 35, 49, 7, 51, 52, 34, 52, + 52, 52, 52, 52, 52, 34, 33, 11, 25, 50, + 34, 34, 60, 33, 34, 34, 11, 34 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -675,20 +683,53 @@ do \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (0) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif #endif + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -711,19 +752,13 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yysymprint (stderr, \ - Token, Value); \ + Type, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -735,12 +770,12 @@ do { \ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -790,8 +825,7 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -809,10 +843,6 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -894,15 +924,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { default: @@ -918,10 +948,11 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; #endif @@ -929,6 +960,10 @@ yydestruct (yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -956,10 +991,10 @@ int yyparse (); -/* The lookahead symbol. */ +/* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -995,7 +1030,7 @@ yyparse () int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1007,9 +1042,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1046,6 +1081,9 @@ yyparse () yyssp = yyss; yyvsp = yyvs; + + yyvsp[0] = yylval; + goto yysetstate; /*------------------------------------------------------------. @@ -1071,7 +1109,7 @@ yyparse () these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1099,7 +1137,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1135,18 +1173,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1161,7 +1199,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1181,8 +1219,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1232,425 +1270,449 @@ yyreduce: switch (yyn) { case 3: -#line 130 "/home/drepper/gnu/elfutils/src/ldscript.y" - { add_versions (yyvsp[0].version); } +#line 132 "/home/drepper/devel/elfutils/src/ldscript.y" + { add_versions ((yyvsp[0].version)); } break; case 6: -#line 138 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 140 "/home/drepper/devel/elfutils/src/ldscript.y" { if (likely (ld_state.entry == NULL)) - ld_state.entry = yyvsp[-2].str; + ld_state.entry = (yyvsp[-2].str); } break; case 7: -#line 143 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 145 "/home/drepper/devel/elfutils/src/ldscript.y" { - ld_new_searchdir (yyvsp[-2].str); + ld_new_searchdir ((yyvsp[-2].str)); } break; case 8: -#line 147 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 149 "/home/drepper/devel/elfutils/src/ldscript.y" { if (likely (ld_state.pagesize == 0)) - ld_state.pagesize = yyvsp[-2].num; + ld_state.pagesize = (yyvsp[-2].num); } break; case 9: -#line 152 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 154 "/home/drepper/devel/elfutils/src/ldscript.y" { if (likely (ld_state.interp == NULL)) - ld_state.interp = yyvsp[-2].str; + ld_state.interp = (yyvsp[-2].str); } break; case 10: -#line 157 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 159 "/home/drepper/devel/elfutils/src/ldscript.y" { - new_segment (yyvsp[-3].num, yyvsp[-1].output_rule); + new_segment ((yyvsp[-3].num), (yyvsp[-1].output_rule)); } break; case 11: -#line 161 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 163 "/home/drepper/devel/elfutils/src/ldscript.y" { fputs_unlocked (gettext ("mode for segment invalid\n"), stderr); - new_segment (0, yyvsp[-1].output_rule); + new_segment (0, (yyvsp[-1].output_rule)); } break; case 12: -#line 167 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 169 "/home/drepper/devel/elfutils/src/ldscript.y" { /* First little optimization. If there is only one file in the group don't do anything. */ - if (yyvsp[-1].filename_list != yyvsp[-1].filename_list->next) + if ((yyvsp[-1].filename_list) != (yyvsp[-1].filename_list)->next) { - yyvsp[-1].filename_list->next->group_start = 1; - yyvsp[-1].filename_list->group_end = 1; + (yyvsp[-1].filename_list)->next->group_start = 1; + (yyvsp[-1].filename_list)->group_end = 1; } - add_inputfiles (yyvsp[-1].filename_list); + add_inputfiles ((yyvsp[-1].filename_list)); } break; case 13: -#line 178 "/home/drepper/gnu/elfutils/src/ldscript.y" - { add_inputfiles (yyvsp[-1].filename_list); } +#line 180 "/home/drepper/devel/elfutils/src/ldscript.y" + { add_inputfiles ((yyvsp[-1].filename_list)); } break; case 14: -#line 180 "/home/drepper/gnu/elfutils/src/ldscript.y" - { add_versions (yyvsp[-1].version); } +#line 182 "/home/drepper/devel/elfutils/src/ldscript.y" + { add_inputfiles (mark_as_needed ((yyvsp[-1].filename_list))); } break; case 15: -#line 182 "/home/drepper/gnu/elfutils/src/ldscript.y" - { /* XXX TODO */ } +#line 184 "/home/drepper/devel/elfutils/src/ldscript.y" + { add_versions ((yyvsp[-1].version)); } break; case 16: -#line 186 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyvsp[0].output_rule->next = yyvsp[-1].output_rule->next; - yyval.output_rule = yyvsp[-1].output_rule->next = yyvsp[0].output_rule; - } +#line 186 "/home/drepper/devel/elfutils/src/ldscript.y" + { /* XXX TODO */ } break; case 17: -#line 191 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.output_rule = yyvsp[0].output_rule; } +#line 190 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyvsp[0].output_rule)->next = (yyvsp[-1].output_rule)->next; + (yyval.output_rule) = (yyvsp[-1].output_rule)->next = (yyvsp[0].output_rule); + } break; case 18: -#line 195 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 195 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.output_rule) = (yyvsp[0].output_rule); } + break; + + case 19: +#line 199 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.output_rule = new_output_rule (output_assignment); - yyval.output_rule->val.assignment = yyvsp[-1].assignment; + (yyval.output_rule) = new_output_rule (output_assignment); + (yyval.output_rule)->val.assignment = (yyvsp[-1].assignment); } break; - case 19: -#line 200 "/home/drepper/gnu/elfutils/src/ldscript.y" + case 20: +#line 204 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.output_rule = new_output_rule (output_section); - yyval.output_rule->val.section.name = yyvsp[-3].str; - yyval.output_rule->val.section.input = yyvsp[-1].input_rule->next; + (yyval.output_rule) = new_output_rule (output_section); + (yyval.output_rule)->val.section.name = (yyvsp[-3].str); + (yyval.output_rule)->val.section.input = (yyvsp[-1].input_rule)->next; if (ld_state.strip == strip_debug - && ebl_debugscn_p (ld_state.ebl, yyvsp[-3].str)) - yyval.output_rule->val.section.ignored = true; + && ebl_debugscn_p (ld_state.ebl, (yyvsp[-3].str))) + (yyval.output_rule)->val.section.ignored = true; else - yyval.output_rule->val.section.ignored = false; - yyvsp[-1].input_rule->next = NULL; + (yyval.output_rule)->val.section.ignored = false; + (yyvsp[-1].input_rule)->next = NULL; } break; - case 20: -#line 212 "/home/drepper/gnu/elfutils/src/ldscript.y" + case 21: +#line 216 "/home/drepper/devel/elfutils/src/ldscript.y" { /* This is a short cut for "ID { *(ID) }". */ - yyval.output_rule = new_output_rule (output_section); - yyval.output_rule->val.section.name = yyvsp[-1].str; - yyval.output_rule->val.section.input = new_input_rule (input_section); - yyval.output_rule->val.section.input->next = NULL; - yyval.output_rule->val.section.input->val.section = + (yyval.output_rule) = new_output_rule (output_section); + (yyval.output_rule)->val.section.name = (yyvsp[-1].str); + (yyval.output_rule)->val.section.input = new_input_rule (input_section); + (yyval.output_rule)->val.section.input->next = NULL; + (yyval.output_rule)->val.section.input->val.section = (struct filemask_section_name *) obstack_alloc (&ld_state.smem, sizeof (struct filemask_section_name)); - yyval.output_rule->val.section.input->val.section->filemask = NULL; - yyval.output_rule->val.section.input->val.section->excludemask = NULL; - yyval.output_rule->val.section.input->val.section->section_name = - new_input_section_name (yyvsp[-1].str, false); - yyval.output_rule->val.section.input->val.section->keep_flag = false; + (yyval.output_rule)->val.section.input->val.section->filemask = NULL; + (yyval.output_rule)->val.section.input->val.section->excludemask = NULL; + (yyval.output_rule)->val.section.input->val.section->section_name = + new_input_section_name ((yyvsp[-1].str), false); + (yyval.output_rule)->val.section.input->val.section->keep_flag = false; if (ld_state.strip == strip_debug - && ebl_debugscn_p (ld_state.ebl, yyvsp[-1].str)) - yyval.output_rule->val.section.ignored = true; + && ebl_debugscn_p (ld_state.ebl, (yyvsp[-1].str))) + (yyval.output_rule)->val.section.ignored = true; else - yyval.output_rule->val.section.ignored = false; + (yyval.output_rule)->val.section.ignored = false; } break; - case 21: -#line 236 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.assignment = new_assignment (yyvsp[-2].str, yyvsp[0].expr, false); } - break; - case 22: -#line 238 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.assignment = new_assignment (yyvsp[-3].str, yyvsp[-1].expr, true); } +#line 240 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.assignment) = new_assignment ((yyvsp[-2].str), (yyvsp[0].expr), false); } break; case 23: -#line 242 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyvsp[0].input_rule->next = yyvsp[-1].input_rule->next; - yyval.input_rule = yyvsp[-1].input_rule->next = yyvsp[0].input_rule; - } +#line 242 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.assignment) = new_assignment ((yyvsp[-3].str), (yyvsp[-1].expr), true); } break; case 24: -#line 247 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.input_rule = yyvsp[0].input_rule; } +#line 246 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyvsp[0].input_rule)->next = (yyvsp[-1].input_rule)->next; + (yyval.input_rule) = (yyvsp[-1].input_rule)->next = (yyvsp[0].input_rule); + } break; case 25: -#line 251 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyval.input_rule = new_input_rule (input_section); - yyval.input_rule->val.section = yyvsp[0].filemask_section_name; - } +#line 251 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.input_rule) = (yyvsp[0].input_rule); } break; case 26: -#line 256 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 255 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyvsp[-1].filemask_section_name->keep_flag = true; - - yyval.input_rule = new_input_rule (input_section); - yyval.input_rule->val.section = yyvsp[-1].filemask_section_name; + (yyval.input_rule) = new_input_rule (input_section); + (yyval.input_rule)->val.section = (yyvsp[0].filemask_section_name); } break; case 27: -#line 263 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 260 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.input_rule = new_input_rule (input_assignment); - yyval.input_rule->val.assignment = yyvsp[-1].assignment; + (yyvsp[-1].filemask_section_name)->keep_flag = true; + + (yyval.input_rule) = new_input_rule (input_section); + (yyval.input_rule)->val.section = (yyvsp[-1].filemask_section_name); } break; case 28: -#line 270 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 267 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.filemask_section_name = (struct filemask_section_name *) - obstack_alloc (&ld_state.smem, sizeof (*yyval.filemask_section_name)); - yyval.filemask_section_name->filemask = yyvsp[-4].str; - yyval.filemask_section_name->excludemask = yyvsp[-2].str; - yyval.filemask_section_name->section_name = yyvsp[-1].sectionname; - yyval.filemask_section_name->keep_flag = false; + (yyval.input_rule) = new_input_rule (input_assignment); + (yyval.input_rule)->val.assignment = (yyvsp[-1].assignment); } break; case 29: -#line 281 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.sectionname = new_input_section_name (yyvsp[0].str, false); } +#line 274 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyval.filemask_section_name) = (struct filemask_section_name *) + obstack_alloc (&ld_state.smem, sizeof (*(yyval.filemask_section_name))); + (yyval.filemask_section_name)->filemask = (yyvsp[-4].str); + (yyval.filemask_section_name)->excludemask = (yyvsp[-2].str); + (yyval.filemask_section_name)->section_name = (yyvsp[-1].sectionname); + (yyval.filemask_section_name)->keep_flag = false; + } break; case 30: -#line 283 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.sectionname = new_input_section_name (yyvsp[-1].str, true); } +#line 285 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.sectionname) = new_input_section_name ((yyvsp[0].str), false); } break; case 31: -#line 287 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = yyvsp[-1].str; } +#line 287 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.sectionname) = new_input_section_name ((yyvsp[-1].str), true); } break; case 32: -#line 289 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = NULL; } +#line 291 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = (yyvsp[-1].str); } break; case 33: -#line 293 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyval.expr = new_expr (exp_align); - yyval.expr->val.child = yyvsp[-1].expr; - } +#line 293 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = NULL; } break; case 34: -#line 298 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.expr = yyvsp[-1].expr; } +#line 297 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyval.expr) = new_expr (exp_align); + (yyval.expr)->val.child = (yyvsp[-1].expr); + } break; case 35: -#line 300 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyval.expr = new_expr (exp_mult); - yyval.expr->val.binary.left = yyvsp[-2].expr; - yyval.expr->val.binary.right = yyvsp[0].expr; - } +#line 302 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.expr) = (yyvsp[-1].expr); } break; case 36: -#line 306 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 304 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (yyvsp[-1].op); - yyval.expr->val.binary.left = yyvsp[-2].expr; - yyval.expr->val.binary.right = yyvsp[0].expr; + (yyval.expr) = new_expr (exp_mult); + (yyval.expr)->val.binary.left = (yyvsp[-2].expr); + (yyval.expr)->val.binary.right = (yyvsp[0].expr); } break; case 37: -#line 312 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 310 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (yyvsp[-1].op); - yyval.expr->val.binary.left = yyvsp[-2].expr; - yyval.expr->val.binary.right = yyvsp[0].expr; + (yyval.expr) = new_expr ((yyvsp[-1].op)); + (yyval.expr)->val.binary.left = (yyvsp[-2].expr); + (yyval.expr)->val.binary.right = (yyvsp[0].expr); } break; case 38: -#line 318 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 316 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (exp_and); - yyval.expr->val.binary.left = yyvsp[-2].expr; - yyval.expr->val.binary.right = yyvsp[0].expr; + (yyval.expr) = new_expr ((yyvsp[-1].op)); + (yyval.expr)->val.binary.left = (yyvsp[-2].expr); + (yyval.expr)->val.binary.right = (yyvsp[0].expr); } break; case 39: -#line 324 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 322 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (exp_or); - yyval.expr->val.binary.left = yyvsp[-2].expr; - yyval.expr->val.binary.right = yyvsp[0].expr; + (yyval.expr) = new_expr (exp_and); + (yyval.expr)->val.binary.left = (yyvsp[-2].expr); + (yyval.expr)->val.binary.right = (yyvsp[0].expr); } break; case 40: -#line 330 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 328 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (exp_num); - yyval.expr->val.num = yyvsp[0].num; + (yyval.expr) = new_expr (exp_or); + (yyval.expr)->val.binary.left = (yyvsp[-2].expr); + (yyval.expr)->val.binary.right = (yyvsp[0].expr); } break; case 41: -#line 335 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 334 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyval.expr = new_expr (exp_id); - yyval.expr->val.str = yyvsp[0].str; + (yyval.expr) = new_expr (exp_num); + (yyval.expr)->val.num = (yyvsp[0].num); } break; case 42: -#line 340 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.expr = new_expr (exp_sizeof_headers); } +#line 339 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyval.expr) = new_expr (exp_id); + (yyval.expr)->val.str = (yyvsp[0].str); + } break; case 43: -#line 342 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.expr = new_expr (exp_pagesize); } +#line 344 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.expr) = new_expr (exp_sizeof_headers); } break; case 44: -#line 346 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - struct filename_list *newp = new_filename_listelem (yyvsp[0].str); - newp->next = yyvsp[-2].filename_list->next; - yyval.filename_list = yyvsp[-2].filename_list->next = newp; - } +#line 346 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.expr) = new_expr (exp_pagesize); } break; case 45: -#line 352 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.filename_list = new_filename_listelem (yyvsp[0].str); } - break; - - case 48: -#line 360 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 350 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyvsp[0].version->next = yyvsp[-1].version->next; - yyval.version = yyvsp[-1].version->next = yyvsp[0].version; + /* First little optimization. If there is only one + file in the group don't do anything. */ + if ((yyvsp[-1].filename_list) != (yyvsp[-1].filename_list)->next) + { + (yyvsp[-1].filename_list)->next->group_start = 1; + (yyvsp[-1].filename_list)->group_end = 1; + } + (yyval.filename_list) = (yyvsp[-1].filename_list); } break; - case 49: -#line 365 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.version = yyvsp[0].version; } + case 46: +#line 361 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.filename_list) = mark_as_needed ((yyvsp[-1].filename_list)); } break; - case 50: -#line 369 "/home/drepper/gnu/elfutils/src/ldscript.y" + case 47: +#line 363 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyvsp[-2].version->versionname = ""; - yyvsp[-2].version->parentname = NULL; - yyval.version = yyvsp[-2].version; + struct filename_list *newp = new_filename_listelem ((yyvsp[0].str)); + newp->next = (yyvsp[-2].filename_list)->next; + (yyval.filename_list) = (yyvsp[-2].filename_list)->next = newp; } break; + case 48: +#line 369 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.filename_list) = new_filename_listelem ((yyvsp[0].str)); } + break; + case 51: -#line 375 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 377 "/home/drepper/devel/elfutils/src/ldscript.y" { - yyvsp[-2].version->versionname = yyvsp[-4].str; - yyvsp[-2].version->parentname = NULL; - yyval.version = yyvsp[-2].version; + (yyvsp[0].version)->next = (yyvsp[-1].version)->next; + (yyval.version) = (yyvsp[-1].version)->next = (yyvsp[0].version); } break; case 52: -#line 381 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - yyvsp[-3].version->versionname = yyvsp[-5].str; - yyvsp[-3].version->parentname = yyvsp[-1].str; - yyval.version = yyvsp[-3].version; - } +#line 382 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.version) = (yyvsp[0].version); } break; case 53: -#line 390 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.version = merge_versions (yyvsp[-1].version, yyvsp[0].version); } +#line 386 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyvsp[-2].version)->versionname = ""; + (yyvsp[-2].version)->parentname = NULL; + (yyval.version) = (yyvsp[-2].version); + } break; case 54: -#line 392 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.version = yyvsp[0].version; } +#line 392 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyvsp[-2].version)->versionname = (yyvsp[-4].str); + (yyvsp[-2].version)->parentname = NULL; + (yyval.version) = (yyvsp[-2].version); + } break; case 55: -#line 396 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.version = new_version (NULL, yyvsp[0].id_list); } +#line 398 "/home/drepper/devel/elfutils/src/ldscript.y" + { + (yyvsp[-3].version)->versionname = (yyvsp[-5].str); + (yyvsp[-3].version)->parentname = (yyvsp[-1].str); + (yyval.version) = (yyvsp[-3].version); + } break; case 56: -#line 398 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.version = new_version (yyvsp[0].id_list, NULL); } +#line 407 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.version) = merge_versions ((yyvsp[-1].version), (yyvsp[0].version)); } break; case 57: -#line 403 "/home/drepper/gnu/elfutils/src/ldscript.y" - { - struct id_list *newp = new_id_listelem (yyvsp[-1].str); - newp->next = yyvsp[-2].id_list->next; - yyval.id_list = yyvsp[-2].id_list->next = newp; - } +#line 409 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.version) = (yyvsp[0].version); } break; case 58: -#line 409 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.id_list = new_id_listelem (yyvsp[-1].str); } +#line 413 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.version) = new_version (NULL, (yyvsp[0].id_list)); } break; case 59: -#line 413 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = yyvsp[0].str; } +#line 415 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.version) = new_version ((yyvsp[0].id_list), NULL); } break; case 60: -#line 415 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = yyvsp[0].str; } +#line 420 "/home/drepper/devel/elfutils/src/ldscript.y" + { + struct id_list *newp = new_id_listelem ((yyvsp[-1].str)); + newp->next = (yyvsp[-2].id_list)->next; + (yyval.id_list) = (yyvsp[-2].id_list)->next = newp; + } break; case 61: -#line 419 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = yyvsp[0].str; } +#line 426 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.id_list) = new_id_listelem ((yyvsp[-1].str)); } break; case 62: -#line 421 "/home/drepper/gnu/elfutils/src/ldscript.y" - { yyval.str = NULL; } +#line 430 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = (yyvsp[0].str); } + break; + + case 63: +#line 432 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = (yyvsp[0].str); } + break; + + case 64: +#line 436 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = (yyvsp[0].str); } + break; + + case 65: +#line 438 "/home/drepper/devel/elfutils/src/ldscript.y" + { (yyval.str) = NULL; } break; } -/* Line 1000 of yacc.c. */ -#line 1654 "ldscript.c" +/* Line 1037 of yacc.c. */ +#line 1716 "ldscript.c" yyvsp -= yylen; yyssp -= yylen; @@ -1750,7 +1812,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -1760,23 +1822,22 @@ yyerrlab: if (yychar == YYEOF) for (;;) { + YYPOPSTACK; if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); + yydestruct ("Error: popping", + yystos[*yyssp], yyvsp); } } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); + yydestruct ("Error: discarding", yytoken, &yylval); yychar = YYEMPTY; - } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -1793,7 +1854,7 @@ yyerrorlab: goto yyerrorlab; #endif - yyvsp -= yylen; +yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; goto yyerrlab1; @@ -1823,8 +1884,8 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); + + yydestruct ("Error: popping", yystos[yystate], yyvsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1833,11 +1894,12 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -1853,6 +1915,9 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: + yydestruct ("Error: discarding lookahead", + yytoken, &yylval); + yychar = YYEMPTY; yyresult = 1; goto yyreturn; @@ -1875,7 +1940,7 @@ yyreturn: } -#line 424 "/home/drepper/gnu/elfutils/src/ldscript.y" +#line 441 "/home/drepper/devel/elfutils/src/ldscript.y" static void @@ -2001,6 +2066,20 @@ new_filename_listelem (const char *string) } +static struct filename_list * +mark_as_needed (struct filename_list *listp) +{ + struct filename_list *runp = listp; + while (runp != NULL) + { + runp->as_needed = true; + runp = runp->next; + } + + return listp; +} + + static void add_inputfiles (struct filename_list *fnames) { |