diff options
Diffstat (limited to 'binutils-2.22/ld/lexsup.c')
| -rw-r--r-- | binutils-2.22/ld/lexsup.c | 157 |
1 files changed, 20 insertions, 137 deletions
diff --git a/binutils-2.22/ld/lexsup.c b/binutils-2.22/ld/lexsup.c index 20e0271..fc410c9 100644 --- a/binutils-2.22/ld/lexsup.c +++ b/binutils-2.22/ld/lexsup.c @@ -1,6 +1,6 @@ /* Parse options for the GNU linker. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -62,122 +62,6 @@ static void set_section_start (char *, char *); static void set_segment_start (const char *, char *); static void help (void); -/* Non-zero if we are processing a --defsym from the command line. */ -int parsing_defsym = 0; - -/* Codes used for the long options with no short synonyms. 150 isn't - special; it's just an arbitrary non-ASCII char value. */ -enum option_values -{ - OPTION_ASSERT = 150, - OPTION_CALL_SHARED, - OPTION_CREF, - OPTION_DEFSYM, - OPTION_DEMANGLE, - OPTION_DYNAMIC_LINKER, - OPTION_SYSROOT, - OPTION_EB, - OPTION_EL, - OPTION_EMBEDDED_RELOCS, - OPTION_EXPORT_DYNAMIC, - OPTION_NO_EXPORT_DYNAMIC, - OPTION_HELP, - OPTION_IGNORE, - OPTION_MAP, - OPTION_NO_DEMANGLE, - OPTION_NO_KEEP_MEMORY, - OPTION_NO_WARN_MISMATCH, - OPTION_NO_WARN_SEARCH_MISMATCH, - OPTION_NOINHIBIT_EXEC, - OPTION_NON_SHARED, - OPTION_NO_WHOLE_ARCHIVE, - OPTION_OFORMAT, - OPTION_RELAX, - OPTION_NO_RELAX, - OPTION_RETAIN_SYMBOLS_FILE, - OPTION_RPATH, - OPTION_RPATH_LINK, - OPTION_SHARED, - OPTION_SONAME, - OPTION_SORT_COMMON, - OPTION_SORT_SECTION, - OPTION_STATS, - OPTION_SYMBOLIC, - OPTION_SYMBOLIC_FUNCTIONS, - OPTION_TASK_LINK, - OPTION_TBSS, - OPTION_TDATA, - OPTION_TTEXT, - OPTION_TTEXT_SEGMENT, - OPTION_TRADITIONAL_FORMAT, - OPTION_UR, - OPTION_VERBOSE, - OPTION_VERSION, - OPTION_VERSION_SCRIPT, - OPTION_VERSION_EXPORTS_SECTION, - OPTION_DYNAMIC_LIST, - OPTION_DYNAMIC_LIST_CPP_NEW, - OPTION_DYNAMIC_LIST_CPP_TYPEINFO, - OPTION_DYNAMIC_LIST_DATA, - OPTION_WARN_COMMON, - OPTION_WARN_CONSTRUCTORS, - OPTION_WARN_FATAL, - OPTION_NO_WARN_FATAL, - OPTION_WARN_MULTIPLE_GP, - OPTION_WARN_ONCE, - OPTION_WARN_SECTION_ALIGN, - OPTION_SPLIT_BY_RELOC, - OPTION_SPLIT_BY_FILE , - OPTION_WHOLE_ARCHIVE, - OPTION_ADD_DT_NEEDED_FOR_DYNAMIC, - OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC, - OPTION_ADD_DT_NEEDED_FOR_REGULAR, - OPTION_NO_ADD_DT_NEEDED_FOR_REGULAR, - OPTION_WRAP, - OPTION_FORCE_EXE_SUFFIX, - OPTION_GC_SECTIONS, - OPTION_NO_GC_SECTIONS, - OPTION_PRINT_GC_SECTIONS, - OPTION_NO_PRINT_GC_SECTIONS, - OPTION_HASH_SIZE, - OPTION_CHECK_SECTIONS, - OPTION_NO_CHECK_SECTIONS, - OPTION_NO_UNDEFINED, - OPTION_INIT, - OPTION_FINI, - OPTION_SECTION_START, - OPTION_UNIQUE, - OPTION_TARGET_HELP, - OPTION_ALLOW_SHLIB_UNDEFINED, - OPTION_NO_ALLOW_SHLIB_UNDEFINED, - OPTION_ALLOW_MULTIPLE_DEFINITION, - OPTION_NO_UNDEFINED_VERSION, - OPTION_DEFAULT_SYMVER, - OPTION_DEFAULT_IMPORTED_SYMVER, - OPTION_DISCARD_NONE, - OPTION_SPARE_DYNAMIC_TAGS, - OPTION_NO_DEFINE_COMMON, - OPTION_NOSTDLIB, - OPTION_NO_OMAGIC, - OPTION_STRIP_DISCARDED, - OPTION_NO_STRIP_DISCARDED, - OPTION_ACCEPT_UNKNOWN_INPUT_ARCH, - OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH, - OPTION_PIE, - OPTION_UNRESOLVED_SYMBOLS, - OPTION_WARN_UNRESOLVED_SYMBOLS, - OPTION_ERROR_UNRESOLVED_SYMBOLS, - OPTION_WARN_SHARED_TEXTREL, - OPTION_WARN_ALTERNATE_EM, - OPTION_REDUCE_MEMORY_OVERHEADS, -#ifdef ENABLE_PLUGINS - OPTION_PLUGIN, - OPTION_PLUGIN_OPT, -#endif /* ENABLE_PLUGINS */ - OPTION_DEFAULT_SCRIPT, - OPTION_PRINT_OUTPUT_FORMAT, -}; - /* The long options. This structure is used for both the option parsing and the help text. */ @@ -729,6 +613,7 @@ parse_args (unsigned argc, char **argv) { int longind; int optc; + static unsigned int defsym_count; /* Using last_optind lets us avoid calling ldemul_parse_args multiple times on a single option, which would lead to @@ -777,10 +662,10 @@ parse_args (unsigned argc, char **argv) ``use only shared libraries'' but, then, we don't currently support shared libraries on HP/UX anyhow. */ if (strcmp (optarg, "archive") == 0) - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; else if (strcmp (optarg, "shared") == 0 || strcmp (optarg, "default") == 0) - config.dynamic_link = TRUE; + input_flags.dynamic = TRUE; else einfo (_("%P%F: unrecognized -a option `%s'\n"), optarg); break; @@ -809,10 +694,10 @@ parse_args (unsigned argc, char **argv) yyparse (); break; case OPTION_CALL_SHARED: - config.dynamic_link = TRUE; + input_flags.dynamic = TRUE; break; case OPTION_NON_SHARED: - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; break; case OPTION_CREF: command_line.cref = TRUE; @@ -823,11 +708,9 @@ parse_args (unsigned argc, char **argv) break; case OPTION_DEFSYM: lex_string = optarg; - lex_redirect (optarg); + lex_redirect (optarg, "--defsym", ++defsym_count); parser_input = input_defsym; - parsing_defsym = 1; yyparse (); - parsing_defsym = 0; lex_string = NULL; break; case OPTION_DEMANGLE: @@ -838,7 +721,7 @@ parse_args (unsigned argc, char **argv) style = cplus_demangle_name_to_style (optarg); if (style == unknown_demangling) - einfo (_("%F%P: unknown demangling style `%s'"), + einfo (_("%F%P: unknown demangling style `%s'\n"), optarg); cplus_demangle_set_style (style); @@ -938,17 +821,17 @@ parse_args (unsigned argc, char **argv) case 'N': config.text_read_only = FALSE; config.magic_demand_paged = FALSE; - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; break; case OPTION_NO_OMAGIC: config.text_read_only = TRUE; config.magic_demand_paged = TRUE; - /* NB/ Does not set dynamic_link to TRUE. + /* NB/ Does not set input_flags.dynamic to TRUE. Use --call-shared or -Bdynamic for this. */ break; case 'n': config.magic_demand_paged = FALSE; - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; break; case OPTION_NO_DEFINE_COMMON: command_line.inhibit_common_definition = TRUE; @@ -1044,7 +927,7 @@ parse_args (unsigned argc, char **argv) config.only_cmd_line_lib_dirs = TRUE; break; case OPTION_NO_WHOLE_ARCHIVE: - whole_archive = FALSE; + input_flags.whole_archive = FALSE; break; case 'O': /* FIXME "-O<non-digits> <value>" used to set the address of @@ -1096,7 +979,7 @@ parse_args (unsigned argc, char **argv) config.build_constructors = FALSE; config.magic_demand_paged = FALSE; config.text_read_only = FALSE; - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; break; case 'R': /* The GNU linker traditionally uses -R to mean to include @@ -1317,7 +1200,7 @@ parse_args (unsigned argc, char **argv) config.build_constructors = TRUE; config.magic_demand_paged = FALSE; config.text_read_only = FALSE; - config.dynamic_link = FALSE; + input_flags.dynamic = FALSE; break; case 'u': ldlang_add_undef (optarg, TRUE); @@ -1331,7 +1214,7 @@ parse_args (unsigned argc, char **argv) case OPTION_VERBOSE: ldversion (1); version_printed = TRUE; - trace_file_tries = TRUE; + verbose = TRUE; overflow_cutoff_limit = -2; if (optarg != NULL) { @@ -1441,19 +1324,19 @@ parse_args (unsigned argc, char **argv) link_info.warn_alternate_em = TRUE; break; case OPTION_WHOLE_ARCHIVE: - whole_archive = TRUE; + input_flags.whole_archive = TRUE; break; case OPTION_ADD_DT_NEEDED_FOR_DYNAMIC: - add_DT_NEEDED_for_dynamic = TRUE; + input_flags.add_DT_NEEDED_for_dynamic = TRUE; break; case OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC: - add_DT_NEEDED_for_dynamic = FALSE; + input_flags.add_DT_NEEDED_for_dynamic = FALSE; break; case OPTION_ADD_DT_NEEDED_FOR_REGULAR: - add_DT_NEEDED_for_regular = TRUE; + input_flags.add_DT_NEEDED_for_regular = TRUE; break; case OPTION_NO_ADD_DT_NEEDED_FOR_REGULAR: - add_DT_NEEDED_for_regular = FALSE; + input_flags.add_DT_NEEDED_for_regular = FALSE; break; case OPTION_WRAP: add_wrap (optarg); |