X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Flexsup.c;h=35041b19b9be0d8b2013990f8c5fab4b48df7ba2;hb=569283d40e3546979fd7c222c61408dd107de32b;hp=a9a26890dfa8564d88f808fdc506b0d98f426b9f;hpb=267e27229efe6d0edd002c87fc02598588503948;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/lexsup.c b/ld/lexsup.c index a9a26890df..35041b19b9 100644 --- a/ld/lexsup.c +++ b/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 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -40,6 +40,9 @@ #include "ldver.h" #include "ldemul.h" #include "demangle.h" +#ifdef ENABLE_PLUGINS +#include "plugin.h" +#endif /* ENABLE_PLUGINS */ #ifndef PATH_SEPARATOR #if defined (__MSDOS__) || (defined (_WIN32) && ! defined (__CYGWIN32__)) @@ -59,119 +62,28 @@ 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_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_NEEDED, - OPTION_NO_ADD_NEEDED, - OPTION_AS_NEEDED, - OPTION_NO_AS_NEEDED, - 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, - OPTION_DEFAULT_SCRIPT -}; - /* The long options. This structure is used for both the option parsing and the help text. */ +enum control_enum { + /* Use one dash before long option name. */ + ONE_DASH, + /* Use two dashes before long option name. */ + TWO_DASHES, + /* Only accept two dashes before the long option name. + This is an overloading of the use of this enum, since originally it + was only intended to tell the --help display function how to display + the long option name. This feature was added in order to resolve + the confusion about the -omagic command line switch. Is it setting + the output file name to "magic" or is it setting the NMAGIC flag on + the output ? It has been decided that it is setting the output file + name, and that if you want to set the NMAGIC flag you should use -N + or --omagic. */ + EXACTLY_TWO_DASHES, + /* Don't mention this option in --help output. */ + NO_HELP +}; + struct ld_option { /* The long option information. */ @@ -183,24 +95,7 @@ struct ld_option /* The documentation string. If this is NULL, this is a synonym for the previous option. */ const char *doc; - enum { - /* Use one dash before long option name. */ - ONE_DASH, - /* Use two dashes before long option name. */ - TWO_DASHES, - /* Only accept two dashes before the long option name. - This is an overloading of the use of this enum, since originally it - was only intended to tell the --help display function how to display - the long option name. This feature was added in order to resolve - the confusion about the -omagic command line switch. Is it setting - the output file name to "magic" or is it setting the NMAGIC flag on - the output ? It has been decided that it is setting the output file - name, and that if you want to set the NMAGIC flag you should use -N - or --omagic. */ - EXACTLY_TWO_DASHES, - /* Don't mention this option in --help output. */ - NO_HELP - } control; + enum control_enum control; }; static const struct ld_option ld_options[] = @@ -268,6 +163,18 @@ static const struct ld_option ld_options[] = 'o', N_("FILE"), N_("Set output file name"), EXACTLY_TWO_DASHES }, { {NULL, required_argument, NULL, '\0'}, 'O', NULL, N_("Optimize output file"), ONE_DASH }, +#ifdef ENABLE_PLUGINS + { {"plugin", required_argument, NULL, OPTION_PLUGIN}, + '\0', N_("PLUGIN"), N_("Load named plugin"), ONE_DASH }, + { {"plugin-opt", required_argument, NULL, OPTION_PLUGIN_OPT}, + '\0', N_("ARG"), N_("Send arg to last-loaded plugin"), ONE_DASH }, + { {"flto", optional_argument, NULL, OPTION_IGNORE}, + '\0', NULL, N_("Ignored for GCC LTO option compatibility"), + ONE_DASH }, + { {"flto-partition=", required_argument, NULL, OPTION_IGNORE}, + '\0', NULL, N_("Ignored for GCC LTO option compatibility"), + ONE_DASH }, +#endif /* ENABLE_PLUGINS */ { {"Qy", no_argument, NULL, OPTION_IGNORE}, '\0', NULL, N_("Ignored for SVR4 compatibility"), ONE_DASH }, { {"emit-relocs", no_argument, NULL, 'q'}, @@ -331,19 +238,21 @@ static const struct ld_option ld_options[] = OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH}, '\0', NULL, N_("Reject input files whose architecture is unknown"), TWO_DASHES }, - { {"add-needed", no_argument, NULL, OPTION_ADD_NEEDED}, - '\0', NULL, N_("Set DT_NEEDED tags for DT_NEEDED entries in\n" - " following dynamic libs"), - TWO_DASHES }, - { {"no-add-needed", no_argument, NULL, OPTION_NO_ADD_NEEDED}, - '\0', NULL, N_("Do not set DT_NEEDED tags for DT_NEEDED entries\n" - " in following dynamic libs"), - TWO_DASHES }, - { {"as-needed", no_argument, NULL, OPTION_AS_NEEDED}, + + /* The next two options are deprecated because of their similarity to + --as-needed and --no-as-needed. They have been replaced by + --copy-dt-needed-entries and --no-copy-dt-needed-entries. */ + { {"add-needed", no_argument, NULL, OPTION_ADD_DT_NEEDED_FOR_DYNAMIC}, + '\0', NULL, NULL, NO_HELP }, + { {"no-add-needed", no_argument, NULL, OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC}, + '\0', NULL, NULL, NO_HELP }, + + { {"as-needed", no_argument, NULL, OPTION_ADD_DT_NEEDED_FOR_REGULAR}, '\0', NULL, N_("Only set DT_NEEDED for following dynamic libs if used"), TWO_DASHES }, - { {"no-as-needed", no_argument, NULL, OPTION_NO_AS_NEEDED}, - '\0', NULL, N_("Always set DT_NEEDED for following dynamic libs"), + { {"no-as-needed", no_argument, NULL, OPTION_NO_ADD_DT_NEEDED_FOR_REGULAR}, + '\0', NULL, N_("Always set DT_NEEDED for dynamic libraries mentioned on\n" + " the command line"), TWO_DASHES }, { {"assert", required_argument, NULL, OPTION_ASSERT}, '\0', N_("KEYWORD"), N_("Ignored for SunOS compatibility"), ONE_DASH }, @@ -371,6 +280,15 @@ static const struct ld_option ld_options[] = { {"no-check-sections", no_argument, NULL, OPTION_NO_CHECK_SECTIONS}, '\0', NULL, N_("Do not check section addresses for overlaps"), TWO_DASHES }, + { {"copy-dt-needed-entries", no_argument, NULL, + OPTION_ADD_DT_NEEDED_FOR_DYNAMIC}, + '\0', NULL, N_("Copy DT_NEEDED links mentioned inside DSOs that follow"), + TWO_DASHES }, + { {"no-copy-dt-needed-entries", no_argument, NULL, + OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC}, + '\0', NULL, N_("Do not copy DT_NEEDED links mentioned inside DSOs that follow"), + TWO_DASHES }, + { {"cref", no_argument, NULL, OPTION_CREF}, '\0', NULL, N_("Output cross reference table"), TWO_DASHES }, { {"defsym", required_argument, NULL, OPTION_DEFSYM}, @@ -421,7 +339,7 @@ static const struct ld_option ld_options[] = '\0', NULL, N_("Do not allow unresolved references in object files"), TWO_DASHES }, { {"allow-shlib-undefined", no_argument, NULL, OPTION_ALLOW_SHLIB_UNDEFINED}, - '\0', NULL, N_("Allow unresolved references in shared libaries"), + '\0', NULL, N_("Allow unresolved references in shared libraries"), TWO_DASHES }, { {"no-allow-shlib-undefined", no_argument, NULL, OPTION_NO_ALLOW_SHLIB_UNDEFINED}, @@ -458,6 +376,8 @@ static const struct ld_option ld_options[] = { {"oformat", required_argument, NULL, OPTION_OFORMAT}, '\0', N_("TARGET"), N_("Specify target of output file"), EXACTLY_TWO_DASHES }, + { {"print-output-format", no_argument, NULL, OPTION_PRINT_OUTPUT_FORMAT}, + '\0', NULL, N_("Print default output format"), TWO_DASHES }, { {"qmagic", no_argument, NULL, OPTION_IGNORE}, '\0', NULL, N_("Ignored for Linux compatibility"), ONE_DASH }, { {"reduce-memory-overheads", no_argument, NULL, @@ -465,7 +385,9 @@ static const struct ld_option ld_options[] = '\0', NULL, N_("Reduce memory overheads, possibly taking much longer"), TWO_DASHES }, { {"relax", no_argument, NULL, OPTION_RELAX}, - '\0', NULL, N_("Relax branches on certain targets"), TWO_DASHES }, + '\0', NULL, N_("Reduce code size by using target specific optimizations"), TWO_DASHES }, + { {"no-relax", no_argument, NULL, OPTION_NO_RELAX}, + '\0', NULL, N_("Do not use relaxation techniques to reduce code size"), TWO_DASHES }, { {"retain-symbols-file", required_argument, NULL, OPTION_RETAIN_SYMBOLS_FILE}, '\0', N_("FILE"), N_("Keep only symbols listed in FILE"), TWO_DASHES }, @@ -483,13 +405,13 @@ static const struct ld_option ld_options[] = { {"pic-executable", no_argument, NULL, OPTION_PIE}, '\0', NULL, NULL, TWO_DASHES }, { {"sort-common", optional_argument, NULL, OPTION_SORT_COMMON}, - '\0', N_("[=ascending|descending]"), - N_("Sort common symbols by alignment [in specified order]"), + '\0', N_("[=ascending|descending]"), + N_("Sort common symbols by alignment [in specified order]"), TWO_DASHES }, { {"sort_common", no_argument, NULL, OPTION_SORT_COMMON}, '\0', NULL, NULL, NO_HELP }, { {"sort-section", required_argument, NULL, OPTION_SORT_SECTION}, - '\0', N_("name|alignment"), + '\0', N_("name|alignment"), N_("Sort sections by name or maximum alignment"), TWO_DASHES }, { {"spare-dynamic-tags", required_argument, NULL, OPTION_SPARE_DYNAMIC_TAGS}, '\0', N_("COUNT"), N_("How many tags to reserve in .dynamic section"), @@ -519,14 +441,17 @@ static const struct ld_option ld_options[] = '\0', N_("ADDRESS"), N_("Set address of .text section"), ONE_DASH }, { {"Ttext-segment", required_argument, NULL, OPTION_TTEXT_SEGMENT}, '\0', N_("ADDRESS"), N_("Set address of text segment"), ONE_DASH }, + { {"Trodata-segment", required_argument, NULL, OPTION_TRODATA_SEGMENT}, + '\0', N_("ADDRESS"), N_("Set address of rodata segment"), ONE_DASH }, { {"unresolved-symbols=", required_argument, NULL, OPTION_UNRESOLVED_SYMBOLS}, '\0', NULL, N_("How to handle unresolved symbols. is:\n" " ignore-all, report-all, ignore-in-object-files,\n" " ignore-in-shared-libs"), TWO_DASHES }, - { {"verbose", no_argument, NULL, OPTION_VERBOSE}, - '\0', NULL, N_("Output lots of information during link"), TWO_DASHES }, + { {"verbose", optional_argument, NULL, OPTION_VERBOSE}, + '\0', N_("[=NUMBER]"), + N_("Output lots of information during link"), TWO_DASHES }, { {"dll-verbose", no_argument, NULL, OPTION_VERBOSE}, /* Linux. */ '\0', NULL, NULL, NO_HELP }, { {"version-script", required_argument, NULL, OPTION_VERSION_SCRIPT }, @@ -573,6 +498,10 @@ static const struct ld_option ld_options[] = TWO_DASHES }, { {"wrap", required_argument, NULL, OPTION_WRAP}, '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }, + { {"ignore-unresolved-symbol", required_argument, NULL, + OPTION_IGNORE_UNRESOLVED_SYMBOL}, + '\0', N_("SYMBOL"), + N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES }, }; #define OPTION_COUNT ARRAY_SIZE (ld_options) @@ -590,9 +519,11 @@ parse_args (unsigned argc, char **argv) int last_optind; enum report_method how_to_report_unresolved_symbols = RM_GENERATE_ERROR; - shortopts = xmalloc (OPTION_COUNT * 3 + 2); - longopts = xmalloc (sizeof (*longopts) * (OPTION_COUNT + 1)); - really_longopts = xmalloc (sizeof (*really_longopts) * (OPTION_COUNT + 1)); + shortopts = (char *) xmalloc (OPTION_COUNT * 3 + 2); + longopts = (struct option *) + xmalloc (sizeof (*longopts) * (OPTION_COUNT + 1)); + really_longopts = (struct option *) + malloc (sizeof (*really_longopts) * (OPTION_COUNT + 1)); /* Starting the short option string with '-' is for programs that expect options and other ARGV-elements in any order and that care about @@ -677,7 +608,7 @@ parse_args (unsigned argc, char **argv) { char *n; - n = xmalloc (strlen (argv[i]) + 20); + n = (char *) xmalloc (strlen (argv[i]) + 20); sprintf (n, "--library=%s", argv[i] + 2); argv[i] = n; } @@ -688,6 +619,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 @@ -736,10 +668,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; @@ -768,10 +700,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; @@ -782,11 +714,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: @@ -797,7 +727,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); @@ -828,12 +758,12 @@ parse_args (unsigned argc, char **argv) break; case 'e': lang_add_entry (optarg, TRUE); - ldlang_add_undef (optarg); break; case 'f': if (command_line.auxiliary_filters == NULL) { - command_line.auxiliary_filters = xmalloc (2 * sizeof (char *)); + command_line.auxiliary_filters = (char **) + xmalloc (2 * sizeof (char *)); command_line.auxiliary_filters[0] = optarg; command_line.auxiliary_filters[1] = NULL; } @@ -845,8 +775,8 @@ parse_args (unsigned argc, char **argv) c = 0; for (p = command_line.auxiliary_filters; *p != NULL; p++) ++c; - command_line.auxiliary_filters - = xrealloc (command_line.auxiliary_filters, + command_line.auxiliary_filters = (char **) + xrealloc (command_line.auxiliary_filters, (c + 2) * sizeof (char *)); command_line.auxiliary_filters[c] = optarg; command_line.auxiliary_filters[c + 1] = NULL; @@ -897,17 +827,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; @@ -1003,7 +933,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 " used to set the address of @@ -1021,6 +951,18 @@ parse_args (unsigned argc, char **argv) case OPTION_OFORMAT: lang_add_output_format (optarg, NULL, NULL, 0); break; + case OPTION_PRINT_OUTPUT_FORMAT: + command_line.print_output_format = TRUE; + break; +#ifdef ENABLE_PLUGINS + case OPTION_PLUGIN: + plugin_opt_plugin (optarg); + break; + case OPTION_PLUGIN_OPT: + if (plugin_opt_plugin_arg (optarg)) + einfo(_("%P%F: bad -plugin-opt option\n")); + break; +#endif /* ENABLE_PLUGINS */ case 'q': link_info.emitrelocations = TRUE; break; @@ -1041,7 +983,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 @@ -1092,7 +1034,7 @@ parse_args (unsigned argc, char **argv) if (cp == NULL) { - buf = xmalloc (rpath_len + optarg_len + 2); + buf = (char *) xmalloc (rpath_len + optarg_len + 2); sprintf (buf, "%s%c%s", command_line.rpath, config.rpath_separator, optarg); free (command_line.rpath); @@ -1107,17 +1049,20 @@ parse_args (unsigned argc, char **argv) { char *buf; - buf = xmalloc (strlen (command_line.rpath_link) - + strlen (optarg) - + 2); + buf = (char *) xmalloc (strlen (command_line.rpath_link) + + strlen (optarg) + + 2); sprintf (buf, "%s%c%s", command_line.rpath_link, config.rpath_separator, optarg); free (command_line.rpath_link); command_line.rpath_link = buf; } break; + case OPTION_NO_RELAX: + DISABLE_RELAXATION; + break; case OPTION_RELAX: - command_line.relax = TRUE; + ENABLE_RELAXATION; break; case OPTION_RETAIN_SYMBOLS_FILE: add_keepsyms_file (optarg); @@ -1224,7 +1169,7 @@ parse_args (unsigned argc, char **argv) /* We must copy the section name as set_section_start doesn't do it for us. */ len = optarg2 - optarg; - sec_name = xmalloc (len); + sec_name = (char *) xmalloc (len); memcpy (sec_name, optarg, len - 1); sec_name[len - 1] = 0; @@ -1248,6 +1193,9 @@ parse_args (unsigned argc, char **argv) case OPTION_TTEXT_SEGMENT: set_segment_start (".text-segment", optarg); break; + case OPTION_TRODATA_SEGMENT: + set_segment_start (".rodata-segment", optarg); + break; case OPTION_TRADITIONAL_FORMAT: link_info.traditional_format = TRUE; break; @@ -1259,10 +1207,10 @@ 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); + ldlang_add_undef (optarg, TRUE); break; case OPTION_UNIQUE: if (optarg != NULL) @@ -1273,8 +1221,18 @@ 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) + { + char *end; + int level ATTRIBUTE_UNUSED = strtoul (optarg, &end, 0); + if (*end) + einfo (_("%P%F: invalid number `%s'\n"), optarg); +#ifdef ENABLE_PLUGINS + report_plugin_symbols = level > 1; +#endif /* ENABLE_PLUGINS */ + } break; case 'v': ldversion (0); @@ -1373,23 +1331,26 @@ 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_NEEDED: - add_needed = TRUE; + case OPTION_ADD_DT_NEEDED_FOR_DYNAMIC: + input_flags.add_DT_NEEDED_for_dynamic = TRUE; break; - case OPTION_NO_ADD_NEEDED: - add_needed = FALSE; + case OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC: + input_flags.add_DT_NEEDED_for_dynamic = FALSE; break; - case OPTION_AS_NEEDED: - as_needed = TRUE; + case OPTION_ADD_DT_NEEDED_FOR_REGULAR: + input_flags.add_DT_NEEDED_for_regular = TRUE; break; - case OPTION_NO_AS_NEEDED: - as_needed = FALSE; + case OPTION_NO_ADD_DT_NEEDED_FOR_REGULAR: + input_flags.add_DT_NEEDED_for_regular = FALSE; break; case OPTION_WRAP: add_wrap (optarg); break; + case OPTION_IGNORE_UNRESOLVED_SYMBOL: + add_ignoresym (&link_info, optarg); + break; case OPTION_DISCARD_NONE: link_info.discard = discard_none; break; @@ -1437,18 +1398,15 @@ parse_args (unsigned argc, char **argv) command_line.accept_unknown_input_arch = FALSE; break; case '(': - if (ingroup) - einfo (_("%P%F: may not nest groups (--help for usage)\n")); - lang_enter_group (); - ingroup = 1; + ingroup++; break; case ')': if (! ingroup) einfo (_("%P%F: group ended before it began (--help for usage)\n")); lang_leave_group (); - ingroup = 0; + ingroup--; break; case OPTION_INIT: @@ -1479,8 +1437,11 @@ parse_args (unsigned argc, char **argv) } } - if (ingroup) - lang_leave_group (); + while (ingroup) + { + lang_leave_group (); + ingroup--; + } if (default_dirlist != NULL) { @@ -1495,6 +1456,72 @@ parse_args (unsigned argc, char **argv) if (link_info.unresolved_syms_in_shared_libs == RM_NOT_YET_SET) /* FIXME: Should we allow emulations a chance to set this ? */ link_info.unresolved_syms_in_shared_libs = how_to_report_unresolved_symbols; + + if (link_info.relocatable) + { + if (command_line.check_section_addresses < 0) + command_line.check_section_addresses = 0; + if (link_info.shared) + einfo (_("%P%F: -r and -shared may not be used together\n")); + } + + /* We may have -Bsymbolic, -Bsymbolic-functions, --dynamic-list-data, + --dynamic-list-cpp-new, --dynamic-list-cpp-typeinfo and + --dynamic-list FILE. -Bsymbolic and -Bsymbolic-functions are + for shared libraries. -Bsymbolic overrides all others and vice + versa. */ + switch (command_line.symbolic) + { + case symbolic_unset: + break; + case symbolic: + /* -Bsymbolic is for shared library only. */ + if (link_info.shared) + { + link_info.symbolic = TRUE; + /* Should we free the unused memory? */ + link_info.dynamic_list = NULL; + command_line.dynamic_list = dynamic_list_unset; + } + break; + case symbolic_functions: + /* -Bsymbolic-functions is for shared library only. */ + if (link_info.shared) + command_line.dynamic_list = dynamic_list_data; + break; + } + + switch (command_line.dynamic_list) + { + case dynamic_list_unset: + break; + case dynamic_list_data: + link_info.dynamic_data = TRUE; + case dynamic_list: + link_info.dynamic = TRUE; + break; + } + + if (! link_info.shared) + { + if (command_line.filter_shlib) + einfo (_("%P%F: -F may not be used without -shared\n")); + if (command_line.auxiliary_filters) + einfo (_("%P%F: -f may not be used without -shared\n")); + } + + if (! link_info.shared || link_info.pie) + link_info.executable = TRUE; + + /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I + don't see how else this can be handled, since in this case we + must preserve all externally visible symbols. */ + if (link_info.relocatable && link_info.strip == strip_all) + { + link_info.strip = strip_debugger; + if (link_info.discard == discard_sec_merge) + link_info.discard = discard_all; + } } /* Add the (colon-separated) elements of DIRLIST_PTR to the @@ -1549,7 +1576,7 @@ set_segment_start (const char *section, char *valstr) } /* There was no existing value so we must create a new segment entry. */ - seg = stat_alloc (sizeof (*seg)); + seg = (segment_type *) stat_alloc (sizeof (*seg)); seg->name = name; seg->value = val; seg->used = FALSE;