diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/compressed_output.cc | 2 | ||||
| -rw-r--r-- | gold/debug.h | 19 | ||||
| -rw-r--r-- | gold/layout.cc | 2 | ||||
| -rw-r--r-- | gold/main.cc | 2 | ||||
| -rw-r--r-- | gold/options.cc | 1511 | ||||
| -rw-r--r-- | gold/options.h | 1238 | ||||
| -rw-r--r-- | gold/parameters.cc | 6 | ||||
| -rw-r--r-- | gold/script.cc | 2 |
8 files changed, 1150 insertions, 1632 deletions
diff --git a/gold/compressed_output.cc b/gold/compressed_output.cc index 1eca021..e62eab2 100644 --- a/gold/compressed_output.cc +++ b/gold/compressed_output.cc @@ -112,7 +112,7 @@ Output_compressed_section::set_final_data_size() this->write_to_postprocessing_buffer(); bool success = false; - if (this->options_->zlib_compress_debug_sections()) + if (strcmp(this->options_->compress_debug_sections(), "zlib") == 0) success = zlib_compress(uncompressed_data, uncompressed_size, &this->data_, &compressed_size); if (success) diff --git a/gold/debug.h b/gold/debug.h index e37e2f1..143c7df 100644 --- a/gold/debug.h +++ b/gold/debug.h @@ -36,6 +36,25 @@ const int DEBUG_SCRIPT = 2; const int DEBUG_ALL = DEBUG_TASK | DEBUG_SCRIPT; +// Convert a debug string to the appropriate enum. +inline int +debug_string_to_enum(const char* arg) +{ + static const struct { const char* name; int value; } + debug_options[] = + { + { "task", DEBUG_TASK }, + { "script", DEBUG_SCRIPT }, + { "all", DEBUG_ALL } + }; + + int retval = 0; + for (size_t i = 0; i < sizeof(debug_options) / sizeof(*debug_options); ++i) + if (strstr(arg, debug_options[i].name)) + retval |= debug_options[i].value; + return retval; +} + // Print a debug message if TYPE is enabled. This is a macro so that // we only evaluate the arguments if necessary. diff --git a/gold/layout.cc b/gold/layout.cc index fd7f3af..1591cfb 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -612,7 +612,7 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type, { Output_section* os; if ((flags & elfcpp::SHF_ALLOC) == 0 - && this->options_.compress_debug_sections() + && strcmp(this->options_.compress_debug_sections(), "none") != 0 && is_compressible_debug_section(name)) os = new Output_compressed_section(&this->options_, name, type, flags); else diff --git a/gold/main.cc b/gold/main.cc index a5fd12c..e4f9003 100644 --- a/gold/main.cc +++ b/gold/main.cc @@ -149,7 +149,7 @@ main(int argc, char** argv) // Handle the command line options. Command_line command_line; - command_line.process(argc - 1, argv + 1); + command_line.process(argc - 1, const_cast<const char**>(argv + 1)); long start_time = 0; if (command_line.options().stats()) diff --git a/gold/options.cc b/gold/options.cc index 88f3db3..5307d86 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -23,6 +23,7 @@ #include "gold.h" #include <cstdlib> +#include <vector> #include <iostream> #include <sys/stat.h> #include "filenames.h" @@ -30,348 +31,321 @@ #include "debug.h" #include "script.h" +#include "target-select.h" #include "options.h" namespace gold { -// The information we keep for a single command line option. +General_options +Position_dependent_options::default_options_; -struct options::One_option +namespace options { - // The single character option name, or '\0' if this is only a long - // option. - char short_option; - // The long option name, or NULL if this is only a short option. - const char* long_option; +// This global variable is set up as General_options is constructed. +static std::vector<const One_option*> registered_options; - // Description of the option for --help output, or NULL if there is none. - const char* doc; +// These are set up at the same time -- the variables that accept one +// dash, two, or require -z. A single variable may be in more than +// one of thes data structures. +typedef Unordered_map<std::string, One_option*> Option_map; +static Option_map* long_options = NULL; +static One_option* short_options[128]; - // How to print the option name in --help output, or NULL to use the - // default. - const char* help_output; - - // Long option dash control. This is ignored if long_option is - // NULL. - enum - { - // Long option normally takes one dash; two dashes are also - // accepted. - ONE_DASH, - // Long option normally takes two dashes; one dash is also - // accepted. - TWO_DASHES, - // Long option always takes two dashes. - EXACTLY_TWO_DASHES - } dash; - - // Function for special handling, or NULL. Returns the number of - // arguments to skip. This will normally be at least 1, but it may - // be 0 if this function changes *argv. ARG points to the location - // in *ARGV where the option starts, which may be helpful for a - // short option. - int (*special)(int argc, char** argv, char *arg, bool long_option, - Command_line*); - - // If this is a position independent option which does not take an - // argument, this is the member function to call to record it. (In - // this file, the bool will always be 'true' to indicate the option - // is set.) - void (General_options::*general_noarg)(bool); - - // If this is a position independent function which takes an - // argument, this is the member function to call to record it. - void (General_options::*general_arg)(const char*); - - // If this is a position dependent option which does not take an - // argument, this is the member function to call to record it. (In - // this file, the bool will always be 'true' to indicate the option - // is set.) - void (Position_dependent_options::*dependent_noarg)(bool); - - // If this is a position dependent option which takes an argument, - // this is the member function to record it. - void (Position_dependent_options::*dependent_arg)(const char*); - - // Return whether this option takes an argument. - bool - takes_argument() const - { return this->general_arg != NULL || this->dependent_arg != NULL; } -}; - -// We have a separate table for -z options. - -struct options::One_z_option +void +One_option::register_option() { - // The name of the option. - const char* name; + registered_options.push_back(this); - // The member function in General_options called to record an option - // which does not take an argument. - void (General_options::*set_noarg)(bool); + // We can't make long_options a static Option_map because we can't + // guarantee that will be initialized before register_option() is + // first called. + if (long_options == NULL) + long_options = new Option_map; - // The member function in General_options called to record an option - // which does take an argument. - void (General_options::*set_arg)(const char*); -}; + // TWO_DASHES means that two dashes are preferred, but one is ok too. + if (!this->longname.empty()) + (*long_options)[this->longname] = this; -// We have a separate table for --debug options. + const int shortname_as_int = static_cast<int>(this->shortname); + gold_assert(shortname_as_int >= 0 && shortname_as_int < 128); + if (this->shortname != '\0') + short_options[shortname_as_int] = this; +} -struct options::One_debug_option +void +One_option::print() const { - // The name of the option. - const char* name; + bool comma = false; + printf(" "); + int len = 2; + if (this->shortname != '\0') + { + len += printf("-%c", this->shortname); + if (this->helparg) + { + // -z takes long-names only. + gold_assert(this->dashes != DASH_Z); + len += printf(" %s", this->helparg); + } + comma = true; + } + if (!this->longname.empty() + && !(this->longname[0] == this->shortname + && this->longname[1] == '\0')) + { + if (comma) + len += printf(", "); + switch (this->dashes) + { + case options::ONE_DASH: case options::EXACTLY_ONE_DASH: + len += printf("-"); + break; + case options::TWO_DASHES: case options::EXACTLY_TWO_DASHES: + len += printf("--"); + break; + case options::DASH_Z: + len += printf("-z "); + break; + default: + gold_unreachable(); + } + len += printf("%s", this->longname.c_str()); + if (this->helparg) + { + // For most options, we print "--frob FOO". But for -z + // we print "-z frob=FOO". + len += printf("%c%s", this->dashes == options::DASH_Z ? '=' : ' ', + this->helparg); + } + } + + if (len >= 30) + { + printf("\n"); + len = 0; + } + for (; len < 30; ++len) + std::putchar(' '); - // The flags to turn on. - unsigned int debug_flags; -}; + // TODO: if we're boolean, add " (default)" when appropriate. + printf("%s\n", this->helpstring); +} -class options::Command_line_options +void +help() { - public: - static const One_option options[]; - static const int options_size; - static const One_z_option z_options[]; - static const int z_options_size; - static const One_debug_option debug_options[]; - static const int debug_options_size; -}; + printf(_("Usage: %s [options] file...\nOptions:\n"), gold::program_name); -} // End namespace gold. + std::vector<const One_option*>::const_iterator it; + for (it = registered_options.begin(); it != registered_options.end(); ++it) + (*it)->print(); +} -namespace +// For bool, arg will be NULL (boolean options take no argument); +// we always just set to true. +void +parse_bool(const char*, const char*, bool* retval) { + *retval = true; +} -// Recognize input and output target names. The GNU linker accepts -// these with --format and --oformat. This code is intended to be -// minimally compatible. In practice for an ELF target this would be -// the same target as the input files; that name always start with -// "elf". Non-ELF targets would be "srec", "symbolsrec", "tekhex", -// "binary", "ihex". See also -// General_options::default_target_settings. +void +parse_uint(const char* option_name, const char* arg, int* retval) +{ + char* endptr; + *retval = strtol(arg, &endptr, 0); + if (*endptr != '\0' || retval < 0) + gold_fatal(_("%s: invalid option value (expected an integer): %s"), + option_name, arg); +} -gold::General_options::Object_format -string_to_object_format(const char* arg) +void +parse_uint64(const char* option_name, const char* arg, uint64_t *retval) { - if (strncmp(arg, "elf", 3) == 0) - return gold::General_options::OBJECT_FORMAT_ELF; - else if (strcmp(arg, "binary") == 0) - return gold::General_options::OBJECT_FORMAT_BINARY; - else + char* endptr; + *retval = strtoull(arg, &endptr, 0); + if (*endptr != '\0') + gold_fatal(_("%s: invalid option value (expected an integer): %s"), + option_name, arg); +} + +void +parse_string(const char* option_name, const char* arg, const char** retval) +{ + if (*arg == '\0') + gold_fatal(_("%s: must take a non-empty argument"), option_name); + *retval = arg; +} + +void +parse_dirlist(const char*, const char* arg, Dir_list* retval) +{ + retval->push_back(Search_directory(arg, false)); +} + +void +parse_choices(const char* option_name, const char* arg, const char** retval, + const char* choices[], int num_choices) +{ + for (int i = 0; i < num_choices; i++) + if (strcmp(choices[i], arg) == 0) + { + *retval = arg; + return; + } + + // If we get here, the user did not enter a valid choice, so we die. + std::string choices_list; + for (int i = 0; i < num_choices; i++) { - gold::gold_error(_("format '%s' not supported " - "(supported formats: elf, binary)"), - arg); - return gold::General_options::OBJECT_FORMAT_ELF; + choices_list += choices[i]; + if (i != num_choices - 1) + choices_list += ", "; } + gold_fatal(_("%s: must take one of the following arguments: %s"), + option_name, choices_list.c_str()); } -// Handle the special -defsym option, which defines a symbol. +} // End namespace options. -int -add_to_defsym(int argc, char** argv, char* arg, bool long_option, - gold::Command_line* cmdline) +// Define the handler for "special" options (set via DEFINE_special). + +void +General_options::parse_help(const char*, const char*, Command_line*) { - int ret; - const char* val = cmdline->get_special_argument("defsym", argc, argv, arg, - long_option, &ret); - cmdline->script_options().define_symbol(val); - return ret; + options::help(); + ::exit(EXIT_SUCCESS); } -// Handle the special -l option, which adds an input file. +void +General_options::parse_version(const char* opt, const char*, Command_line*) +{ + gold::print_version(opt[0] == '-' && opt[1] == 'v'); + ::exit(EXIT_SUCCESS); +} -int -library(int argc, char** argv, char* arg, bool long_option, - gold::Command_line* cmdline) +void +General_options::parse_Bstatic(const char*, const char*, Command_line*) { - return cmdline->process_l_option(argc, argv, arg, long_option); + this->set_Bdynamic(false); } -// Handle the -R option. Historically the GNU linker made -R a -// synonym for --just-symbols. ELF linkers have traditionally made -R -// a synonym for -rpath. When ELF support was added to the GNU -// linker, -R was changed to switch based on the argument: if the -// argument is an ordinary file, we treat it as --just-symbols, -// otherwise we treat it as -rpath. We need to be compatible with -// this, because existing build scripts rely on it. +void +General_options::parse_defsym(const char*, const char* arg, + Command_line* cmdline) +{ + cmdline->script_options().define_symbol(arg); +} -int -handle_r_option(int argc, char** argv, char* arg, bool long_option, - gold::Command_line* cmdline) +void +General_options::parse_library(const char*, const char* arg, + Command_line* cmdline) +{ + Input_file_argument file(arg, true, "", false, *this); + cmdline->inputs().add_file(file); +} + +void +General_options::parse_R(const char* option, const char* arg, + Command_line* cmdline) { - int ret; - const char* val = cmdline->get_special_argument("R", argc, argv, arg, - long_option, &ret); struct stat s; - if (::stat(val, &s) != 0 || S_ISDIR(s.st_mode)) - cmdline->add_to_rpath(val); + if (::stat(arg, &s) != 0 || S_ISDIR(s.st_mode)) + this->add_to_rpath(arg); else - cmdline->add_just_symbols_file(val); - return ret; + this->parse_just_symbols(option, arg, cmdline); } -// Handle the --just-symbols option. - -int -handle_just_symbols_option(int argc, char** argv, char* arg, - bool long_option, gold::Command_line* cmdline) +void +General_options::parse_just_symbols(const char*, const char* arg, + Command_line* cmdline) { - int ret; - const char* val = cmdline->get_special_argument("just-symbols", argc, argv, - arg, long_option, &ret); - cmdline->add_just_symbols_file(val); - return ret; + Input_file_argument file(arg, false, "", true, *this); + cmdline->inputs().add_file(file); } -// Handle the special -T/--script option, which reads a linker script. - -int -invoke_script(int argc, char** argv, char* arg, bool long_option, - gold::Command_line* cmdline) +void +General_options::parse_static(const char*, const char*, Command_line*) { - int ret; - const char* script_name = cmdline->get_special_argument("script", argc, argv, - arg, long_option, - &ret); - if (!read_commandline_script(script_name, cmdline)) - gold::gold_fatal(_("unable to parse script file %s"), script_name); - return ret; + this->set_static(true); } -// Handle the special --version-script option, which reads a version script. - -int -invoke_version_script(int argc, char** argv, char* arg, bool long_option, - gold::Command_line* cmdline) +void +General_options::parse_script(const char*, const char* arg, + Command_line* cmdline) { - int ret; - const char* script_name = cmdline->get_special_argument("version-script", - argc, argv, - arg, long_option, - &ret); - if (!read_version_script(script_name, cmdline)) - gold::gold_fatal(_("unable to parse version script file %s"), script_name); - return ret; + if (!read_commandline_script(arg, cmdline)) + gold::gold_fatal(_("unable to parse script file %s"), arg); } -// Handle the special --start-group option. - -int -start_group(int, char**, char* arg, bool, gold::Command_line* cmdline) +void +General_options::parse_version_script(const char*, const char* arg, + Command_line* cmdline) { - cmdline->start_group(arg); - return 1; + if (!read_version_script(arg, cmdline)) + gold::gold_fatal(_("unable to parse version script file %s"), arg); } -// Handle the special --end-group option. +void +General_options::parse_start_group(const char*, const char*, + Command_line* cmdline) +{ + cmdline->inputs().start_group(); +} -int -end_group(int, char**, char* arg, bool, gold::Command_line* cmdline) +void +General_options::parse_end_group(const char*, const char*, + Command_line* cmdline) { - cmdline->end_group(arg); - return 1; + cmdline->inputs().end_group(); } -// Report usage information for ld --help, and exit. +} // End namespace gold. -int -help(int, char**, char*, bool, gold::Command_line*) +namespace { - printf(_("Usage: %s [options] file...\nOptions:\n"), gold::program_name); - const int options_size = gold::options::Command_line_options::options_size; - const gold::options::One_option* options = - gold::options::Command_line_options::options; - for (int i = 0; i < options_size; ++i) - { - if (options[i].doc == NULL) - continue; - - printf(" "); - int len = 2; - bool comma = false; - - int j = i; - do - { - if (options[j].help_output != NULL) - { - if (comma) - { - printf(", "); - len += 2; - } - printf(options[j].help_output); - len += std::strlen(options[j].help_output); - comma = true; - } - else - { - if (options[j].short_option != '\0') - { - if (comma) - { - printf(", "); - len += 2; - } - printf("-%c", options[j].short_option); - len += 2; - comma = true; - } - - if (options[j].long_option != NULL) - { - if (comma) - { - printf(", "); - len += 2; - } - if (options[j].dash == gold::options::One_option::ONE_DASH) - { - printf("-"); - ++len; - } - else - { - printf("--"); - len += 2; - } - printf("%s", options[j].long_option); - len += std::strlen(options[j].long_option); - comma = true; - } - } - ++j; - } - while (j < options_size && options[j].doc == NULL); - - if (len >= 30) - { - printf("\n"); - len = 0; - } - for (; len < 30; ++len) - std::putchar(' '); - - std::puts(options[i].doc); - } - - ::exit(EXIT_SUCCESS); +void +usage() +{ + fprintf(stderr, + _("%s: use the --help option for usage information\n"), + gold::program_name); + ::exit(EXIT_FAILURE); +} - return 0; +void +usage(const char* msg, const char *opt) +{ + fprintf(stderr, + _("%s: %s: %s\n"), + gold::program_name, opt, msg); + usage(); } -// Report version information. +// Recognize input and output target names. The GNU linker accepts +// these with --format and --oformat. This code is intended to be +// minimally compatible. In practice for an ELF target this would be +// the same target as the input files; that name always start with +// "elf". Non-ELF targets would be "srec", "symbolsrec", "tekhex", +// "binary", "ihex". -int -version(int, char**, char* opt, bool, gold::Command_line*) +gold::General_options::Object_format +string_to_object_format(const char* arg) { - gold::print_version(opt[0] == 'v' && opt[1] == '\0'); - ::exit(EXIT_SUCCESS); - return 0; + if (strncmp(arg, "elf", 3) == 0) + return gold::General_options::OBJECT_FORMAT_ELF; + else if (strcmp(arg, "binary") == 0) + return gold::General_options::OBJECT_FORMAT_BINARY; + else + { + gold::gold_error(_("format '%s' not supported " + "(supported formats: elf, binary)"), + arg); + return gold::General_options::OBJECT_FORMAT_ELF; + } } // If the default sysroot is relocatable, try relocating it based on @@ -381,12 +355,12 @@ char* get_relative_sysroot(const char* from) { char* path = make_relative_prefix(gold::program_name, from, - TARGET_SYSTEM_ROOT); + TARGET_SYSTEM_ROOT); if (path != NULL) { struct stat s; if (::stat(path, &s) == 0 && S_ISDIR(s.st_mode)) - return path; + return path; free(path); } @@ -394,402 +368,191 @@ get_relative_sysroot(const char* from) } // Return the default sysroot. This is set by the --with-sysroot -// option to configure. +// option to configure. Note we do not free the return value of +// get_relative_sysroot, which is a small memory leak, but is +// necessary since we store this pointer directly in General_options. -std::string +const char* get_default_sysroot() { const char* sysroot = TARGET_SYSTEM_ROOT; if (*sysroot == '\0') - return ""; + return NULL; if (TARGET_SYSTEM_ROOT_RELOCATABLE) { - char* path = get_relative_sysroot (BINDIR); + char* path = get_relative_sysroot(BINDIR); if (path == NULL) - path = get_relative_sysroot (TOOLBINDIR); + path = get_relative_sysroot(TOOLBINDIR); if (path != NULL) - { - std::string ret = path; - free(path); - return ret; - } + return path; } return sysroot; } -} // End anonymous namespace. - -namespace gold +// Parse a long option. Such options have the form +// <-|--><option>[=arg]. If "=arg" is not present but the option +// takes an argument, the next word is taken to the be the argument. +// If equals_only is set, then only the <option>=<arg> form is +// accepted, not the <option><space><arg> form. Returns a One_option +// struct or NULL if argv[i] cannot be parsed as a long option. In +// the not-NULL case, *arg is set to the option's argument (NULL if +// the option takes no argument), and *i is advanced past this option. +// NOTE: it is safe for argv and arg to point to the same place. +gold::options::One_option* +parse_long_option(int argc, const char** argv, bool equals_only, + const char** arg, int* i) { + const char* const this_argv = argv[*i]; -// Helper macros used to specify the options. We could also do this -// using constructors, but then g++ would generate code to initialize -// the array. We want the array to be initialized statically so that -// we get better startup time. - -#define GENERAL_NOARG(short_option, long_option, doc, help, dash, func) \ - { short_option, long_option, doc, help, options::One_option::dash, \ - NULL, func, NULL, NULL, NULL } -#define GENERAL_ARG(short_option, long_option, doc, help, dash, func) \ - { short_option, long_option, doc, help, options::One_option::dash, \ - NULL, NULL, func, NULL, NULL } -#define POSDEP_NOARG(short_option, long_option, doc, help, dash, func) \ - { short_option, long_option, doc, help, options::One_option::dash, \ - NULL, NULL, NULL, func, NULL } -#define POSDEP_ARG(short_option, long_option, doc, help, dash, func) \ - { short_option, long_option, doc, help, options::One_option::dash, \ - NULL, NULL, NULL, NULL, func } -#define SPECIAL(short_option, long_option, doc, help, dash, func) \ - { short_option, long_option, doc, help, options::One_option::dash, \ - func, NULL, NULL, NULL, NULL } - -// Here is the actual list of options which we accept. - -const options::One_option -options::Command_line_options::options[] = -{ - GENERAL_NOARG('\0', "allow-shlib-undefined", - N_("Allow unresolved references in shared libraries"), - NULL, TWO_DASHES, - &General_options::set_allow_shlib_undefined), - GENERAL_NOARG('\0', "no-allow-shlib-undefined", - N_("Do not allow unresolved references in shared libraries"), - NULL, TWO_DASHES, - &General_options::set_no_allow_shlib_undefined), - POSDEP_NOARG('\0', "as-needed", - N_("Only set DT_NEEDED for dynamic libs if used"), - NULL, TWO_DASHES, &Position_dependent_options::set_as_needed), - POSDEP_NOARG('\0', "no-as-needed", - N_("Always DT_NEEDED for dynamic libs (default)"), - NULL, TWO_DASHES, &Position_dependent_options::set_no_as_needed), - POSDEP_NOARG('\0', "Bdynamic", - N_("-l searches for shared libraries"), - NULL, ONE_DASH, - &Position_dependent_options::set_Bdynamic), - POSDEP_NOARG('\0', "Bstatic", - N_("-l does not search for shared libraries"), - NULL, ONE_DASH, - &Position_dependent_options::set_Bstatic), - GENERAL_NOARG('\0', "Bsymbolic", N_("Bind defined symbols locally"), - NULL, ONE_DASH, &General_options::set_Bsymbolic), - POSDEP_ARG('b', "format", N_("Set input format (elf, binary)"), - N_("-b FORMAT, --format FORMAT"), TWO_DASHES, - &Position_dependent_options::set_format), -#ifdef HAVE_ZLIB_H -# define ZLIB_STR ",zlib" -#else -# define ZLIB_STR "" -#endif - GENERAL_ARG('\0', "compress-debug-sections", - N_("Compress .debug_* sections in the output file " - "(default is none)"), - N_("--compress-debug-sections=[none" ZLIB_STR "]"), - TWO_DASHES, - &General_options::set_compress_debug_sections), - GENERAL_NOARG('d', "define-common", N_("Define common symbols"), - NULL, TWO_DASHES, &General_options::set_define_common), - GENERAL_NOARG('\0', "dc", NULL, NULL, ONE_DASH, - &General_options::set_define_common), - GENERAL_NOARG('\0', "dp", NULL, NULL, ONE_DASH, - &General_options::set_define_common), - GENERAL_NOARG('\0', "no-define-common", N_("Do not define common symbols"), - NULL, TWO_DASHES, &General_options::set_no_define_common), - SPECIAL('\0', "defsym", N_("Define a symbol"), - N_("--defsym SYMBOL=EXPRESSION"), TWO_DASHES, - &add_to_defsym), - GENERAL_NOARG('\0', "demangle", N_("Demangle C++ symbols in log messages"), - NULL, TWO_DASHES, &General_options::set_demangle), - GENERAL_NOARG('\0', "no-demangle", - N_("Do not demangle C++ symbols in log messages"), - NULL, TWO_DASHES, &General_options::set_no_demangle), - GENERAL_NOARG('\0', "detect-odr-violations", - N_("Try to detect violations of the One Definition Rule"), - NULL, TWO_DASHES, &General_options::set_detect_odr_violations), - GENERAL_ARG('e', "entry", N_("Set program start address"), - N_("-e ADDRESS, --entry ADDRESS"), TWO_DASHES, - &General_options::set_entry), - GENERAL_NOARG('E', "export-dynamic", N_("Export all dynamic symbols"), - NULL, TWO_DASHES, &General_options::set_export_dynamic), - GENERAL_NOARG('\0', "eh-frame-hdr", N_("Create exception frame header"), - NULL, TWO_DASHES, &General_options::set_eh_frame_hdr), - GENERAL_ARG('h', "soname", N_("Set shared library name"), - N_("-h FILENAME, -soname FILENAME"), ONE_DASH, - &General_options::set_soname), - GENERAL_ARG('I', "dynamic-linker", N_("Set dynamic linker path"), - N_("-I PROGRAM, --dynamic-linker PROGRAM"), TWO_DASHES, - &General_options::set_dynamic_linker), - SPECIAL('l', "library", N_("Search for library LIBNAME"), - N_("-lLIBNAME, --library LIBNAME"), TWO_DASHES, - &library), - GENERAL_ARG('L', "library-path", N_("Add directory to search path"), - N_("-L DIR, --library-path DIR"), TWO_DASHES, - &General_options::add_to_search_path), - GENERAL_ARG('m', NULL, N_("Ignored for compatibility"), NULL, ONE_DASH, - &General_options::ignore), - GENERAL_ARG('o', "output", N_("Set output file name"), - N_("-o FILE, --output FILE"), TWO_DASHES, - &General_options::set_output), - GENERAL_ARG('O', "optimize", N_("Optimize output file size"), - N_("-O level"), ONE_DASH, - &General_options::set_optimize), - GENERAL_ARG('\0', "oformat", N_("Set output format (only binary supported)"), - N_("--oformat FORMAT"), EXACTLY_TWO_DASHES, - &General_options::set_oformat), - GENERAL_NOARG('q', "emit-relocs", N_("Generate relocations in output"), - NULL, TWO_DASHES, &General_options::set_emit_relocs), - GENERAL_NOARG('r', "relocatable", N_("Generate relocatable output"), NULL, - TWO_DASHES, &General_options::set_relocatable), - // -R really means -rpath, but can mean --just-symbols for - // compatibility with GNU ld. -rpath is always -rpath, so we list - // it separately. - SPECIAL('R', NULL, N_("Add DIR to runtime search path"), - N_("-R DIR"), ONE_DASH, &handle_r_option), - GENERAL_ARG('\0', "rpath", NULL, N_("-rpath DIR"), ONE_DASH, - &General_options::add_to_rpath), - SPECIAL('\0', "just-symbols", N_("Read only symbol values from file"), - N_("-R FILE, --just-symbols FILE"), TWO_DASHES, - &handle_just_symbols_option), - GENERAL_ARG('\0', "rpath-link", - N_("Add DIR to link time shared library search path"), - N_("--rpath-link DIR"), TWO_DASHES, - &General_options::add_to_rpath_link), - GENERAL_NOARG('s', "strip-all", N_("Strip all symbols"), NULL, - TWO_DASHES, &General_options::set_strip_all), - GENERAL_NOARG('\0', "strip-debug-gdb", - N_("Strip debug symbols that are unused by gdb " - "(at least versions <= 6.7)"), - NULL, TWO_DASHES, &General_options::set_strip_debug_gdb), - // This must come after -Sdebug since it's a prefix of it. - GENERAL_NOARG('S', "strip-debug", N_("Strip debugging information"), NULL, - TWO_DASHES, &General_options::set_strip_debug), - GENERAL_NOARG('\0', "shared", N_("Generate shared library"), - NULL, ONE_DASH, &General_options::set_shared), - GENERAL_NOARG('\0', "static", N_("Do not link against shared libraries"), - NULL, ONE_DASH, &General_options::set_static), - GENERAL_NOARG('\0', "stats", N_("Print resource usage statistics"), - NULL, TWO_DASHES, &General_options::set_stats), - GENERAL_ARG('\0', "sysroot", N_("Set target system root directory"), - N_("--sysroot DIR"), TWO_DASHES, &General_options::set_sysroot), - GENERAL_ARG('\0', "Tbss", N_("Set the address of the bss segment"), - N_("-Tbss ADDRESS"), ONE_DASH, - &General_options::set_Tbss), - GENERAL_ARG('\0', "Tdata", N_("Set the address of the data segment"), - N_("-Tdata ADDRESS"), ONE_DASH, - &General_options::set_Tdata), - GENERAL_ARG('\0', "Ttext", N_("Set the address of the text segment"), - N_("-Ttext ADDRESS"), ONE_DASH, - &General_options::set_Ttext), - // This must come after -Ttext and friends since it's a prefix of - // them. - SPECIAL('T', "script", N_("Read linker script"), - N_("-T FILE, --script FILE"), TWO_DASHES, - &invoke_script), - SPECIAL('\0', "version-script", N_("Read version script"), - N_("--version-script FILE"), TWO_DASHES, - &invoke_version_script), - GENERAL_NOARG('\0', "threads", N_("Run the linker multi-threaded"), - NULL, TWO_DASHES, &General_options::set_threads), - GENERAL_NOARG('\0', "no-threads", N_("Do not run the linker multi-threaded"), - NULL, TWO_DASHES, &General_options::set_no_threads), - GENERAL_ARG('\0', "thread-count", N_("Number of threads to use"), - N_("--thread-count COUNT"), TWO_DASHES, - &General_options::set_thread_count), - GENERAL_ARG('\0', "thread-count-initial", - N_("Number of threads to use in initial pass"), - N_("--thread-count-initial COUNT"), TWO_DASHES, - &General_options::set_thread_count_initial), - GENERAL_ARG('\0', "thread-count-middle", - N_("Number of threads to use in middle pass"), - N_("--thread-count-middle COUNT"), TWO_DASHES, - &General_options::set_thread_count_middle), - GENERAL_ARG('\0', "thread-count-final", - N_("Number of threads to use in final pass"), - N_("--thread-count-final COUNT"), TWO_DASHES, - &General_options::set_thread_count_final), - POSDEP_NOARG('\0', "whole-archive", - N_("Include all archive contents"), - NULL, TWO_DASHES, - &Position_dependent_options::set_whole_archive), - POSDEP_NOARG('\0', "no-whole-archive", - N_("Include only needed archive contents"), - NULL, TWO_DASHES, - &Position_dependent_options::set_no_whole_archive), - - GENERAL_ARG('z', NULL, - N_("Subcommands as follows:\n\ - -z execstack Mark output as requiring executable stack\n\ - -z noexecstack Mark output as not requiring executable stack\n\ - -z max-page-size=SIZE Set maximum page size to SIZE\n\ - -z common-page-size=SIZE Set common page size to SIZE"), - N_("-z SUBCOMMAND"), ONE_DASH, - &General_options::handle_z_option), - - SPECIAL('(', "start-group", N_("Start a library search group"), NULL, - TWO_DASHES, &start_group), - SPECIAL(')', "end-group", N_("End a library search group"), NULL, - TWO_DASHES, &end_group), - SPECIAL('\0', "help", N_("Report usage information"), NULL, - TWO_DASHES, &help), - SPECIAL('v', "version", N_("Report version information"), NULL, - TWO_DASHES, &version), - GENERAL_ARG('\0', "debug", N_("Turn on debugging (all,task,script)"), - N_("--debug=TYPE"), TWO_DASHES, - &General_options::handle_debug_option) -}; - -const int options::Command_line_options::options_size = - sizeof (options) / sizeof (options[0]); - -// The -z options. - -const options::One_z_option -options::Command_line_options::z_options[] = -{ - { "execstack", &General_options::set_execstack, NULL }, - { "noexecstack", &General_options::set_noexecstack, NULL }, - { "max-page-size", NULL, &General_options::set_max_page_size }, - { "common-page-size", NULL, &General_options::set_common_page_size } -}; + const char* equals = strchr(this_argv, '='); + const char* option_start = this_argv + strspn(this_argv, "-"); + std::string option(option_start, + equals ? equals - option_start : strlen(option_start)); -const int options::Command_line_options::z_options_size = - sizeof(z_options) / sizeof(z_options[0]); + gold::options::Option_map::iterator it + = gold::options::long_options->find(option); + if (it == gold::options::long_options->end()) + return NULL; -// The --debug options. + gold::options::One_option* retval = it->second; -const options::One_debug_option -options::Command_line_options::debug_options[] = -{ - { "all", DEBUG_ALL }, - { "task", DEBUG_TASK }, - { "script", DEBUG_SCRIPT } -}; - -const int options::Command_line_options::debug_options_size = - sizeof(debug_options) / sizeof(debug_options[0]); - -// The default values for the general options. + // If the dash-count doesn't match, we fail. + if (this_argv[0] != '-') // no dashes at all: had better be "-z <longopt>" + { + if (retval->dashes != gold::options::DASH_Z) + return NULL; + } + else if (this_argv[1] != '-') // one dash + { + if (retval->dashes != gold::options::ONE_DASH + && retval->dashes != gold::options::EXACTLY_ONE_DASH + && retval->dashes != gold::options::TWO_DASHES) + return NULL; + } + else // two dashes (or more!) + { + if (retval->dashes != gold::options::TWO_DASHES + && retval->dashes != gold::options::EXACTLY_TWO_DASHES + && retval->dashes != gold::options::ONE_DASH) + return NULL; + } -General_options::General_options() - : define_common_(false), - user_set_define_common_(false), - entry_(NULL), - export_dynamic_(false), - soname_(NULL), - dynamic_linker_(NULL), - search_path_(), - optimization_level_(0), - output_file_name_("a.out"), - oformat_(OBJECT_FORMAT_ELF), - oformat_string_(NULL), - emit_relocs_(false), - is_relocatable_(false), - strip_(STRIP_NONE), - allow_shlib_undefined_(false), - symbolic_(false), - compress_debug_sections_(NO_COMPRESSION), - detect_odr_violations_(false), - create_eh_frame_hdr_(false), - rpath_(), - rpath_link_(), - is_shared_(false), - is_static_(false), - print_stats_(false), - sysroot_(), - bss_segment_address_(-1U), // -1 indicates value not set by user - data_segment_address_(-1U), - text_segment_address_(-1U), - threads_(false), - thread_count_initial_(0), - thread_count_middle_(0), - thread_count_final_(0), - execstack_(EXECSTACK_FROM_INPUT), - max_page_size_(0), - common_page_size_(0), - debug_(0) -{ - // We initialize demangle_ based on the environment variable - // COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the - // output of the linker, unless COLLECT_NO_DEMANGLE is set in the - // environment. Acting the same way here lets us provide the same - // interface by default. - this->demangle_ = getenv("COLLECT_NO_DEMANGLE") == NULL; -} + // Now that we know the option is good (or else bad in a way that + // will cause us to die), increment i to point past this argv. + ++(*i); -// Handle the --oformat option. + // Figure out the option's argument, if any. + if (!retval->takes_argument()) + { + if (equals) + usage(_("unexpected argument"), this_argv); + else + *arg = NULL; + } + else + { + if (equals) + *arg = equals + 1; + else if (*i < argc && !equals_only) + *arg = argv[(*i)++]; + else + usage(_("missing argument"), this_argv); + } -void -General_options::set_oformat(const char* arg) -{ - this->oformat_string_ = arg; - this->oformat_ = string_to_object_format(arg); -} + return retval; +} + +// Parse a short option. Such options have the form -<option>[arg]. +// If "arg" is not present but the option takes an argument, the next +// word is taken to the be the argument. If the option does not take +// an argument, it may be followed by another short option. Returns a +// One_option struct or NULL if argv[i] cannot be parsed as a short +// option. In the not-NULL case, *arg is set to the option's argument +// (NULL if the option takes no argument), and *i is advanced past +// this option. This function keeps *i the same if we parsed a short +// option that does not take an argument, that looks to be followed by +// another short option in the same word. +gold::options::One_option* +parse_short_option(int argc, const char** argv, int pos_in_argv_i, + const char** arg, int* i) +{ + const char* const this_argv = argv[*i]; + + if (this_argv[0] != '-') + return NULL; + + // We handle -z as a special case. + static gold::options::One_option dash_z("", gold::options::DASH_Z, + 'z', "", "-z", "Z-OPTION", NULL); + gold::options::One_option* retval = NULL; + if (this_argv[pos_in_argv_i] == 'z') + retval = &dash_z; + else + { + const int char_as_int = static_cast<int>(this_argv[pos_in_argv_i]); + if (char_as_int > 0 && char_as_int < 128) + retval = gold::options::short_options[char_as_int]; + } -// Handle the -z option. + if (retval == NULL) + return NULL; -void -General_options::handle_z_option(const char* arg) -{ - // ARG may be a word, like "noexec", or it may be an option in its - // own right, like "max-page-size=SIZE". - const char* argarg = strchr(arg, '='); // the argument to the -z argument - int arglen; - if (argarg) + // Figure out the option's argument, if any. + if (!retval->takes_argument()) { - arglen = argarg - arg; - argarg++; + *arg = NULL; + // We only advance past this argument if it's the only one in argv. + if (this_argv[pos_in_argv_i + 1] == '\0') + ++(*i); } else - arglen = strlen(arg); + { + // If we take an argument, we'll eat up this entire argv entry. + ++(*i); + if (this_argv[pos_in_argv_i + 1] != '\0') + *arg = this_argv + pos_in_argv_i + 1; + else if (*i < argc) + *arg = argv[(*i)++]; + else + usage(_("missing argument"), this_argv); + } - const int z_options_size = options::Command_line_options::z_options_size; - const gold::options::One_z_option* z_options = - gold::options::Command_line_options::z_options; - for (int i = 0; i < z_options_size; ++i) + // If we're a -z option, we need to parse our argument as a + // long-option, e.g. "-z stacksize=8192". + if (retval == &dash_z) { - if (memcmp(arg, z_options[i].name, arglen) == 0 - && z_options[i].name[arglen] == '\0') - { - if (z_options[i].set_noarg && argarg) - gold::gold_fatal(_("-z subcommand does not take an argument: %s\n"), - z_options[i].name); - else if (z_options[i].set_arg && !argarg) - gold::gold_fatal(_("-z subcommand requires an argument: %s\n"), - z_options[i].name); - else if (z_options[i].set_arg) - (this->*(z_options[i].set_arg))(argarg); - else - (this->*(z_options[i].set_noarg))(true); - return; - } + int dummy_i = 0; + const char* dash_z_arg = *arg; + retval = parse_long_option(1, arg, true, arg, &dummy_i); + if (retval == NULL) + usage(_("unknown -z option"), dash_z_arg); } - gold::gold_fatal(_("%s: unrecognized -z subcommand: %s\n"), - program_name, arg); + return retval; } -// Handle the --debug option. +} // End anonymous namespace. -void -General_options::handle_debug_option(const char* arg) +namespace gold { - const int debug_options_size = - options::Command_line_options::debug_options_size; - const gold::options::One_debug_option* debug_options = - options::Command_line_options::debug_options; - for (int i = 0; i < debug_options_size; ++i) - { - if (strcmp(arg, debug_options[i].name) == 0) - { - this->set_debug(debug_options[i].debug_flags); - return; - } - } - fprintf(stderr, _("%s: unrecognized --debug subcommand: %s\n"), - program_name, arg); - ::exit(EXIT_FAILURE); +General_options::General_options() + : execstack_status_(General_options::EXECSTACK_FROM_INPUT), static_(false) +{ +} + +General_options::Object_format +General_options::format_enum() const +{ + return string_to_object_format(this->format()); +} + +General_options::Object_format +General_options::oformat_enum() const +{ + return string_to_object_format(this->oformat()); } // Add the sysroot, if any, to the search paths. @@ -797,40 +560,92 @@ General_options::handle_debug_option(const char* arg) void General_options::add_sysroot() { - if (this->sysroot_.empty()) + if (this->sysroot() == NULL || this->sysroot()[0] == '\0') { - this->sysroot_ = get_default_sysroot(); - if (this->sysroot_.empty()) - return; + this->set_sysroot(get_default_sysroot()); + if (this->sysroot() == NULL || this->sysroot()[0] == '\0') + return; } - const char* sysroot = this->sysroot_.c_str(); - char* canonical_sysroot = lrealpath(sysroot); + char* canonical_sysroot = lrealpath(this->sysroot()); - for (Dir_list::iterator p = this->search_path_.begin(); - p != this->search_path_.end(); + for (Dir_list::iterator p = this->library_path_.value.begin(); + p != this->library_path_.value.end(); ++p) - p->add_sysroot(sysroot, canonical_sysroot); + p->add_sysroot(this->sysroot(), canonical_sysroot); free(canonical_sysroot); } -// The default values for the position dependent options. +// Set up variables and other state that isn't set up automatically by +// the parse routine, and ensure options don't contradict each other +// and are otherwise kosher. -Position_dependent_options::Position_dependent_options() - : do_static_search_(false), - as_needed_(false), - include_whole_archive_(false), - input_format_(General_options::OBJECT_FORMAT_ELF) +void +General_options::finalize() { -} + // Normalize the strip modifiers. They have a total order: + // strip_all > strip_debug > strip_debug_gdb. If one is true, set + // all beneath it to true as well. + if (this->strip_all()) + this->set_strip_debug(true); + if (this->strip_debug()) + this->set_strip_debug_gdb(true); -// Set the input format. + // If the user specifies both -s and -r, convert the -s to -S. + // -r requires us to keep externally visible symbols! + if (this->strip_all() && this->relocatable()) + { + this->set_strip_all(false); + gold_assert(this->strip_debug()); + } -void -Position_dependent_options::set_format(const char* arg) -{ - this->input_format_ = string_to_object_format(arg); + // For us, -dc and -dp are synonyms for --define-common. + if (this->dc()) + this->set_define_common(true); + if (this->dp()) + this->set_define_common(true); + + // We also set --define-common if we're not relocatable, as long as + // the user didn't explicitly ask for something different. + if (!this->user_set_define_common()) + this->set_define_common(!this->relocatable()); + + // execstack_status_ is a three-state variable; update it based on + // -z [no]execstack. + if (this->execstack()) + this->set_execstack_status(EXECSTACK_YES); + else if (this->noexecstack()) + this->set_execstack_status(EXECSTACK_NO); + + // If --thread_count is specified, it applies to + // --thread-count-{initial,middle,final}, though it doesn't override + // them. + if (this->thread_count() > 0 && this->thread_count_initial() == 0) + this->set_thread_count_initial(this->thread_count()); + if (this->thread_count() > 0 && this->thread_count_middle() == 0) + this->set_thread_count_middle(this->thread_count()); + if (this->thread_count() > 0 && this->thread_count_final() == 0) + this->set_thread_count_final(this->thread_count()); + + // Even if they don't specify it, we add -L /lib and -L /usr/lib. + // FIXME: We should only do this when configured in native mode. + this->add_to_library_path_with_sysroot("/lib"); + this->add_to_library_path_with_sysroot("/usr/lib"); + + // Normalize library_path() by adding the sysroot to all directories + // in the path, as appropriate. + this->add_sysroot(); + + // Now that we've normalized the options, check for contradictory ones. + if (this->shared() && this->relocatable()) + gold_fatal(_("-shared and -r are incompatible")); + + if (this->oformat_enum() != General_options::OBJECT_FORMAT_ELF + && (this->shared() || this->relocatable())) + gold_fatal(_("binary output format not compatible with -shared or -r")); + + // FIXME: we can/should be doing a lot more sanity checking here. } // Search_directory methods. @@ -840,14 +655,14 @@ Position_dependent_options::set_format(const char* arg) void Search_directory::add_sysroot(const char* sysroot, - const char* canonical_sysroot) + const char* canonical_sysroot) { gold_assert(*sysroot != '\0'); if (this->put_in_sysroot_) { if (!IS_DIR_SEPARATOR(this->name_[0]) - && !IS_DIR_SEPARATOR(sysroot[strlen(sysroot) - 1])) - this->name_ = '/' + this->name_; + && !IS_DIR_SEPARATOR(sysroot[strlen(sysroot) - 1])) + this->name_ = '/' + this->name_; this->name_ = sysroot + this->name_; this->is_in_sysroot_ = true; } @@ -860,12 +675,12 @@ Search_directory::add_sysroot(const char* sysroot, int canonical_name_len = strlen(canonical_name); int canonical_sysroot_len = strlen(canonical_sysroot); if (canonical_name_len > canonical_sysroot_len - && IS_DIR_SEPARATOR(canonical_name[canonical_sysroot_len])) - { - canonical_name[canonical_sysroot_len] = '\0'; - if (FILENAME_CMP(canonical_name, canonical_sysroot) == 0) - this->is_in_sysroot_ = true; - } + && IS_DIR_SEPARATOR(canonical_name[canonical_sysroot_len])) + { + canonical_name[canonical_sysroot_len] = '\0'; + if (FILENAME_CMP(canonical_name, canonical_sysroot) == 0) + this->is_in_sysroot_ = true; + } free(canonical_name); } } @@ -892,7 +707,8 @@ Input_arguments::add_file(const Input_file_argument& file) void Input_arguments::start_group() { - gold_assert(!this->in_group_); + if (this->in_group_) + gold_fatal(_("May not nest groups")); Input_file_group* group = new Input_file_group(); this->input_argument_list_.push_back(Input_argument(group)); this->in_group_ = true; @@ -903,354 +719,97 @@ Input_arguments::start_group() void Input_arguments::end_group() { - gold_assert(this->in_group_); + if (!this->in_group_) + gold_fatal(_("Group end without group start")); this->in_group_ = false; } // Command_line options. Command_line::Command_line() - : options_(), position_options_(), script_options_(), inputs_() { } -// Process the command line options. For process_one_option, -// i is the index of argv to process next, and the return value -// is the index of the next option to process (i+1 or i+2, or argc -// to indicate processing is done). no_more_options is set to true -// if (and when) "--" is seen as an option. +// Process the command line options. For process_one_option, i is the +// index of argv to process next, and must be an option (that is, +// start with a dash). The return value is the index of the next +// option to process (i+1 or i+2, or argc to indicate processing is +// done). no_more_options is set to true if (and when) "--" is seen +// as an option. int -Command_line::process_one_option(int argc, char** argv, int i, +Command_line::process_one_option(int argc, const char** argv, int i, bool* no_more_options) { - const int options_size = options::Command_line_options::options_size; - const options::One_option* options = options::Command_line_options::options; - gold_assert(i < argc); + gold_assert(argv[i][0] == '-' && !(*no_more_options)); - if (argv[i][0] != '-' || *no_more_options) + // If we are reading "--", then just set no_more_options and return. + if (argv[i][1] == '-' && argv[i][2] == '\0') { - this->add_file(argv[i], false); + *no_more_options = true; return i + 1; } - // Option starting with '-'. - int dashes = 1; - if (argv[i][1] == '-') - { - dashes = 2; - if (argv[i][2] == '\0') - { - *no_more_options = true; - return i + 1; - } - } + int new_i = i; + options::One_option* option = NULL; + const char* arg = NULL; - // Look for a long option match. - char* opt = argv[i] + dashes; - char first = opt[0]; - int skiparg = 0; - char* arg = strchr(opt, '='); - bool argument_with_equals = arg != NULL; - if (arg != NULL) - { - *arg = '\0'; - ++arg; - } - else if (i + 1 < argc) + // First, try to process argv as a long option. + option = parse_long_option(argc, argv, false, &arg, &new_i); + if (option) { - arg = argv[i + 1]; - skiparg = 1; + option->reader->parse_to_value(argv[i], arg, this, &this->options_); + return new_i; } - int j; - for (j = 0; j < options_size; ++j) + // Now, try to process argv as a short option. Since several short + // options can be combined in one argv, we may have to parse a lot + // until we're done reading this argv. + int pos_in_argv_i = 1; + while (new_i == i) { - if (options[j].long_option != NULL - && (dashes == 2 - || (options[j].dash - != options::One_option::EXACTLY_TWO_DASHES)) - && first == options[j].long_option[0] - && strcmp(opt, options[j].long_option) == 0) - { - if (options[j].special) - { - // Restore the '=' we clobbered above. - if (arg != NULL && skiparg == 0) - arg[-1] = '='; - i += options[j].special(argc - i, argv + i, opt, true, this); - } - else - { - if (!options[j].takes_argument()) - { - if (argument_with_equals) - this->usage(_("unexpected argument"), argv[i]); - arg = NULL; - skiparg = 0; - } - else - { - if (arg == NULL) - this->usage(_("missing argument"), argv[i]); - } - this->apply_option(options[j], arg); - i += skiparg + 1; - } - break; - } + option = parse_short_option(argc, argv, pos_in_argv_i, &arg, &new_i); + if (!option) + break; + option->reader->parse_to_value(argv[i], arg, this, &this->options_); + ++pos_in_argv_i; } - if (j < options_size) - return i; - - // If we saw two dashes, we needed to have seen a long option. - if (dashes == 2) - this->usage(_("unknown option"), argv[i]); - - // Look for a short option match. There may be more than one - // short option in a given argument. - bool done = false; - char* s = argv[i] + 1; - ++i; - while (*s != '\0' && !done) - { - char opt = *s; - int j; - for (j = 0; j < options_size; ++j) - { - if (options[j].short_option == opt) - { - if (options[j].special) - { - // Undo the argument skip done above. - --i; - i += options[j].special(argc - i, argv + i, s, false, - this); - done = true; - } - else - { - arg = NULL; - if (options[j].takes_argument()) - { - if (s[1] != '\0') - { - arg = s + 1; - done = true; - } - else if (i < argc) - { - arg = argv[i]; - ++i; - } - else - this->usage(_("missing argument"), opt); - } - this->apply_option(options[j], arg); - } - break; - } - } + if (option) + return new_i; - if (j >= options_size) - this->usage(_("unknown option"), *s); - - ++s; - } - return i; + // I guess it's neither a long option nor a short option. + usage(_("unknown option"), argv[i]); + return argc; } void -Command_line::process(int argc, char** argv) +Command_line::process(int argc, const char** argv) { bool no_more_options = false; int i = 0; while (i < argc) - i = process_one_option(argc, argv, i, &no_more_options); - - if (this->inputs_.in_group()) { - fprintf(stderr, _("%s: missing group end\n"), program_name); - this->usage(); - } - - // FIXME: We should only do this when configured in native mode. - this->options_.add_to_search_path_with_sysroot("/lib"); - this->options_.add_to_search_path_with_sysroot("/usr/lib"); - - this->options_.add_sysroot(); - - // Ensure options don't contradict each other and are otherwise kosher. - this->normalize_options(); -} - -// Extract an option argument for a special option. LONGNAME is the -// long name of the option. This sets *PRET to the return value for -// the special function handler to skip to the next option. - -const char* -Command_line::get_special_argument(const char* longname, int argc, char** argv, - const char* arg, bool long_option, - int *pret) -{ - if (long_option) - { - size_t longlen = strlen(longname); - gold_assert(strncmp(arg, longname, longlen) == 0); - arg += longlen; - if (*arg == '=') - { - *pret = 1; - return arg + 1; - } - else if (argc > 1) - { - gold_assert(*arg == '\0'); - *pret = 2; - return argv[1]; - } - } - else - { - if (arg[1] != '\0') - { - *pret = 1; - return arg + 1; - } - else if (argc > 1) - { - *pret = 2; - return argv[1]; - } - } - - this->usage(_("missing argument"), arg); -} - -// Ensure options don't contradict each other and are otherwise kosher. - -void -Command_line::normalize_options() -{ - if (this->options_.shared() && this->options_.relocatable()) - gold_fatal(_("-shared and -r are incompatible")); - - if (this->options_.oformat_enum() != General_options::OBJECT_FORMAT_ELF - && (this->options_.shared() || this->options_.relocatable())) - gold_fatal(_("binary output format not compatible with -shared or -r")); - - // If the user specifies both -s and -r, convert the -s as -S. - // -r requires us to keep externally visible symbols! - if (this->options_.strip_all() && this->options_.relocatable()) - { - // Clears the strip_all() status, replacing it with strip_debug(). - this->options_.set_strip_debug(true); - } - - // Set default value for define_common. - if (!this->options_.user_set_define_common()) - this->options_.set_define_common(!this->options_.relocatable()); - - // FIXME: we can/should be doing a lot more sanity checking here. -} - - -// Apply a command line option. - -void -Command_line::apply_option(const options::One_option& opt, - const char* arg) -{ - if (arg == NULL) - { - if (opt.general_noarg) - (this->options_.*(opt.general_noarg))(true); - else if (opt.dependent_noarg) - (this->position_options_.*(opt.dependent_noarg))(true); - else - gold_unreachable(); - } - else - { - if (opt.general_arg) - (this->options_.*(opt.general_arg))(arg); - else if (opt.dependent_arg) - (this->position_options_.*(opt.dependent_arg))(arg); + this->position_options_.copy_from_options(this->options()); + if (no_more_options || argv[i][0] != '-') + { + Input_file_argument file(argv[i], false, "", false, + this->position_options_); + this->inputs_.add_file(file); + ++i; + } else - gold_unreachable(); + i = process_one_option(argc, argv, i, &no_more_options); } -} -// Add an input file or library. - -void -Command_line::add_file(const char* name, bool is_lib) -{ - Input_file_argument file(name, is_lib, "", false, this->position_options_); - this->inputs_.add_file(file); -} - -// Handle the -l option, which requires special treatment. - -int -Command_line::process_l_option(int argc, char** argv, char* arg, - bool long_option) -{ - int ret; - const char* libname = this->get_special_argument("library", argc, argv, arg, - long_option, &ret); - this->add_file(libname, true); - return ret; -} - -// Handle the --start-group option. - -void -Command_line::start_group(const char* arg) -{ if (this->inputs_.in_group()) - this->usage(_("may not nest groups"), arg); - this->inputs_.start_group(); -} - -// Handle the --end-group option. - -void -Command_line::end_group(const char* arg) -{ - if (!this->inputs_.in_group()) - this->usage(_("group end without group start"), arg); - this->inputs_.end_group(); -} - -// Report a usage error. */ - -void -Command_line::usage() -{ - fprintf(stderr, - _("%s: use the --help option for usage information\n"), - program_name); - ::exit(EXIT_FAILURE); -} - -void -Command_line::usage(const char* msg, const char *opt) -{ - fprintf(stderr, - _("%s: %s: %s\n"), - program_name, opt, msg); - this->usage(); -} + { + fprintf(stderr, _("%s: missing group end\n"), program_name); + usage(); + } -void -Command_line::usage(const char* msg, char opt) -{ - fprintf(stderr, - _("%s: -%c: %s\n"), - program_name, opt, msg); - this->usage(); + // Normalize the options and ensure they don't contradict each other. + this->options_.finalize(); } } // End namespace gold. diff --git a/gold/options.h b/gold/options.h index 1b3f396..30ffb8c 100644 --- a/gold/options.h +++ b/gold/options.h @@ -20,14 +20,18 @@ // Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, // MA 02110-1301, USA. -// Command_line -// Holds everything we get from the command line. // General_options (from Command_line::options()) -// Options which are not position dependent. +// All the options (a.k.a. command-line flags) // Input_argument (from Command_line::inputs()) // The list of input files, including -l options. -// Position_dependent_options (from Input_argument::options()) -// Position dependent options which apply to this argument. +// Command_line +// Everything we get from the command line -- the General_options +// plus the Input_arguments. +// +// There are also some smaller classes, such as +// Position_dependent_options which hold a subset of General_options +// that change as options are parsed (as opposed to the usual behavior +// of the last instance of that option specified on the commandline wins). #ifndef GOLD_OPTIONS_H #define GOLD_OPTIONS_H @@ -44,19 +48,297 @@ namespace gold { class Command_line; +class General_options; +class Search_directory; class Input_file_group; class Position_dependent_options; class Target; +// The nested namespace is to contain all the global variables and +// structs that need to be defined in the .h file, but do not need to +// be used outside this class. namespace options { +typedef std::vector<Search_directory> Dir_list; + +// These routines convert from a string option to various types. +// Each gives a fatal error if it cannot parse the argument. + +extern void +parse_bool(const char* option_name, const char* arg, bool* retval); + +extern void +parse_uint(const char* option_name, const char* arg, int* retval); + +extern void +parse_uint64(const char* option_name, const char* arg, uint64_t *retval); + +extern void +parse_string(const char* option_name, const char* arg, const char** retval); + +extern void +parse_dirlist(const char* option_name, const char* arg, Dir_list* retval); + +extern void +parse_choices(const char* option_name, const char* arg, const char** retval, + const char* choices[], int num_choices); + +struct Struct_var; + +// Most options have both a shortname (one letter) and a longname. +// This enum controls how many dashes are expected for longname access +// -- shortnames always use one dash. Most longnames will accept +// either one dash or two; the only difference between ONE_DASH and +// TWO_DASHES is how we print the option in --help. However, some +// longnames require two dashes, and some require only one. The +// special value DASH_Z means that the option is preceded by "-z". +enum Dashes +{ + ONE_DASH, TWO_DASHES, EXACTLY_ONE_DASH, EXACTLY_TWO_DASHES, DASH_Z +}; + +// LONGNAME is the long-name of the option with dashes converted to +// underscores, or else the short-name if the option has no long-name. +// It is never the empty string. +// DASHES is an instance of the Dashes enum: ONE_DASH, TWO_DASHES, etc. +// SHORTNAME is the short-name of the option, as a char, or '\0' if the +// option has no short-name. If the option has no long-name, you +// should specify the short-name in *both* VARNAME and here. +// DEFAULT_VALUE is the value of the option if not specified on the +// commandline, as a string. +// HELPSTRING is the descriptive text used with the option via --help +// HELPARG is how you define the argument to the option. +// --help output is "-shortname HELPARG, --longname HELPARG: HELPSTRING" +// HELPARG should be NULL iff the option is a bool and takes no arg. +// READER provides parse_to_value, which is a function that will convert +// a char* argument into the proper type and store it in some variable. +// A One_option struct initializes itself with the global list of options +// at constructor time, so be careful making one of these. +struct One_option +{ + std::string longname; + Dashes dashes; + char shortname; + const char* default_value; + const char* helpstring; + const char* helparg; + Struct_var* reader; + + One_option(const char* ln, Dashes d, char sn, const char* dv, + const char* hs, const char* ha, Struct_var* r) + : longname(ln), dashes(d), shortname(sn), default_value(dv ? dv : ""), + helpstring(hs), helparg(ha), reader(r) + { + // In longname, we convert all underscores to dashes, since GNU + // style uses dashes in option names. longname is likely to have + // underscores in it because it's also used to declare a C++ + // function. + const char* pos = strchr(this->longname.c_str(), '_'); + for (; pos; pos = strchr(pos, '_')) + this->longname[pos - this->longname.c_str()] = '-'; + + // We only register ourselves if our helpstring is not NULL. This + // is to support the "no-VAR" boolean variables, which we + // conditionally turn on by defining "no-VAR" help text. + if (this->helpstring) + this->register_option(); + } + + // This option takes an argument iff helparg is not NULL. + bool + takes_argument() const + { return this->helparg != NULL; } + + // Register this option with the global list of options. + void + register_option(); + + // Print this option to stdout (used with --help). + void + print() const; +}; + +// All options have a Struct_##varname that inherits from this and +// actually implements parse_to_value for that option. +struct Struct_var +{ + // OPTION: the name of the option as specified on the commandline, + // including leading dashes, and any text following the option: + // "-O", "--defsym=mysym=0x1000", etc. + // ARG: the arg associated with this option, or NULL if the option + // takes no argument: "2", "mysym=0x1000", etc. + // CMDLINE: the global Command_line object. Used by DEFINE_special. + // OPTIONS: the global General_options object. Used by DEFINE_special. + virtual void + parse_to_value(const char* option, const char* arg, + Command_line* cmdline, General_options* options) = 0; + virtual + ~Struct_var() // To make gcc happy. + { } +}; -class Command_line_options; -struct One_option; -struct One_z_option; -struct One_debug_option; +// This is for "special" options that aren't of any predefined type. +struct Struct_special : public Struct_var +{ + // If you change this, change the parse-fn in DEFINE_special as well. + typedef void (General_options::*Parse_function)(const char*, const char*, + Command_line*); + Struct_special(const char* varname, Dashes dashes, char shortname, + Parse_function parse_function, + const char* helpstring, const char* helparg) + : option(varname, dashes, shortname, "", helpstring, helparg, this), + parse(parse_function) + { } + + void parse_to_value(const char* option, const char* arg, + Command_line* cmdline, General_options* options) + { (options->*(this->parse))(option, arg, cmdline); } + + One_option option; + Parse_function parse; +}; + +} // End namespace options. + + +// These are helper macros use by DEFINE_uint64/etc below. +// This macro is used inside the General_options_ class, so defines +// var() and set_var() as General_options methods. Arguments as are +// for the constructor for One_option. param_type__ is the same as +// type__ for built-in types, and "const type__ &" otherwise. +#define DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + default_value_as_string__, helpstring__, helparg__, \ + type__, param_type__, parse_fn__) \ + public: \ + param_type__ \ + varname__() const \ + { return this->varname__##_.value; } \ + \ + bool \ + user_set_##varname__() const \ + { return this->varname__##_.user_set_via_option; } \ + \ + private: \ + struct Struct_##varname__ : public options::Struct_var \ + { \ + Struct_##varname__() \ + : option(#varname__, dashes__, shortname__, default_value_as_string__, \ + helpstring__, helparg__, this), \ + user_set_via_option(false), value(default_value__) \ + { } \ + \ + void \ + parse_to_value(const char* option_name, const char* arg, \ + Command_line*, General_options*) \ + { \ + parse_fn__(option_name, arg, &this->value); \ + this->user_set_via_option = true; \ + } \ + \ + options::One_option option; \ + bool user_set_via_option; \ + type__ value; \ + }; \ + Struct_##varname__ varname__##_; \ + void \ + set_##varname__(param_type__ value) \ + { this->varname__##_.value = value; } + +// These macros allow for easy addition of a new commandline option. + +// If no_helpstring__ is not NULL, then in addition to creating +// VARNAME, we also create an option called no-VARNAME. +#define DEFINE_bool(varname__, dashes__, shortname__, default_value__, \ + helpstring__, no_helpstring__) \ + DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + default_value__ ? "true" : "false", helpstring__, NULL, \ + bool, bool, options::parse_bool) \ + struct Struct_no_##varname__ : public options::Struct_var \ + { \ + Struct_no_##varname__() : option("no-" #varname__, dashes__, '\0', \ + default_value__ ? "false" : "true", \ + no_helpstring__, NULL, this) \ + { } \ + \ + void \ + parse_to_value(const char*, const char*, \ + Command_line*, General_options* options) \ + { options->set_##varname__(false); } \ + \ + options::One_option option; \ + }; \ + Struct_no_##varname__ no_##varname__##_initializer_ + +#define DEFINE_uint(varname__, dashes__, shortname__, default_value__, \ + helpstring__, helparg__) \ + DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + #default_value__, helpstring__, helparg__, \ + int, int, options::parse_uint) + +#define DEFINE_uint64(varname__, dashes__, shortname__, default_value__, \ + helpstring__, helparg__) \ + DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + #default_value__, helpstring__, helparg__, \ + uint64_t, uint64_t, options::parse_uint64) + +#define DEFINE_string(varname__, dashes__, shortname__, default_value__, \ + helpstring__, helparg__) \ + DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + default_value__, helpstring__, helparg__, \ + const char*, const char*, options::parse_string) + +// This is like DEFINE_string, but we convert each occurrence to a +// Search_directory and store it in a vector. Thus we also have the +// add_to_VARNAME() method, to append to the vector. +#define DEFINE_dirlist(varname__, dashes__, shortname__, \ + helpstring__, helparg__) \ + DEFINE_var(varname__, dashes__, shortname__, , \ + "", helpstring__, helparg__, options::Dir_list, \ + const options::Dir_list&, options::parse_dirlist) \ + void \ + add_to_##varname__(const char* new_value) \ + { options::parse_dirlist(NULL, new_value, &this->varname__##_.value); } \ + void \ + add_search_directory_to_##varname__(const Search_directory& dir) \ + { this->varname__##_.value.push_back(dir); } + +// When you have a list of possible values (expressed as string) +// After helparg__ should come an initializer list, like +// {"foo", "bar", "baz"} +#define DEFINE_enum(varname__, dashes__, shortname__, default_value__, \ + helpstring__, helparg__, ...) \ + DEFINE_var(varname__, dashes__, shortname__, default_value__, \ + default_value__, helpstring__, helparg__, \ + const char*, const char*, parse_choices_##varname__) \ + private: \ + static void parse_choices_##varname__(const char* option_name, \ + const char* arg, \ + const char** retval) { \ + const char* choices[] = __VA_ARGS__; \ + options::parse_choices(option_name, arg, retval, \ + choices, sizeof(choices) / sizeof(*choices)); \ + } + +// This is used for non-standard flags. It defines no functions; it +// just calls General_options::parse_VARNAME whenever the flag is +// seen. We declare parse_VARNAME as a static member of +// General_options; you are responsible for defining it there. +// helparg__ should be NULL iff this special-option is a boolean. +#define DEFINE_special(varname__, dashes__, shortname__, \ + helpstring__, helparg__) \ + private: \ + void parse_##varname__(const char* option, const char* arg, \ + Command_line* inputs); \ + struct Struct_##varname__ : public options::Struct_special \ + { \ + Struct_##varname__() \ + : options::Struct_special(#varname__, dashes__, shortname__, \ + &General_options::parse_##varname__, \ + helpstring__, helparg__) \ + { } \ + }; \ + Struct_##varname__ varname__##_initializer_ -} // End namespace gold::options. // A directory to search. For each directory we record whether it is // in the sysroot. We need to know this so that, if a linker script @@ -105,154 +387,216 @@ class Search_directory bool is_in_sysroot_; }; -// The position independent options which apply to the whole link. -// There are a lot of them. - class General_options { - public: - enum Object_format - { - // Ordinary ELF. - OBJECT_FORMAT_ELF, - // Straight binary format. - OBJECT_FORMAT_BINARY - }; - - General_options(); + private: + // NOTE: For every option that you add here, also consider if you + // should add it to Position_dependent_options. + DEFINE_special(help, options::TWO_DASHES, '\0', + _("Report usage information"), NULL); + DEFINE_special(version, options::TWO_DASHES, 'v', + _("Report version information"), NULL); + + DEFINE_bool(allow_shlib_undefined, options::TWO_DASHES, '\0', false, + _("Allow unresolved references in shared libraries"), + _("Do not allow unresolved references in shared libraries")); + + DEFINE_bool(as_needed, options::TWO_DASHES, '\0', false, + _("Only set DT_NEEDED for dynamic libs if used"), + _("Always DT_NEEDED for dynamic libs")); + + DEFINE_bool(Bdynamic, options::ONE_DASH, '\0', true, + _("-l searches for shared libraries"), NULL); + // Bstatic affects the same variable as Bdynamic, so we have to use + // the "special" macro to make that happen. + DEFINE_special(Bstatic, options::ONE_DASH, '\0', + _("-l does not search for shared libraries"), NULL); + + DEFINE_bool(Bsymbolic, options::ONE_DASH, '\0', false, + _("Bind defined symbols locally"), NULL); + + DEFINE_enum(format, options::TWO_DASHES, 'b', "elf", + _("Set input format"), _("[elf,binary]"), + {"elf", "binary", + "elf32-i386", "elf32-little", "elf32-big", + "elf64-x86_64", "elf64-little", "elf64-big"}); - // -d: define common symbols. - bool - define_common() const - { return this->define_common_; } +#ifdef HAVE_ZLIB_H + DEFINE_enum(compress_debug_sections, options::TWO_DASHES, '\0', "none", + _("Compress .debug_* sections in the output file"), + _("[none,zlib]"), + {"none", "zlib"}); +#else + DEFINE_enum(compress_debug_sections, options::TWO_DASHES, '\0', "none", + _("Compress .debug_* sections in the output file"), + _("[none]"), + {"none"}); +#endif - // -e: set entry address. - const char* - entry() const - { return this->entry_; } + DEFINE_bool(define_common, options::TWO_DASHES, 'd', false, + _("Define common symbols"), + _("Do not define common symbols")); + DEFINE_bool(dc, options::ONE_DASH, '\0', false, + _("Alias for -d"), NULL); + DEFINE_bool(dp, options::ONE_DASH, '\0', false, + _("Alias for -d"), NULL); - // -E: export dynamic symbols. - bool - export_dynamic() const - { return this->export_dynamic_; } + DEFINE_special(defsym, options::TWO_DASHES, '\0', + _("Define a symbol"), _("SYMBOL=EXPRESSION")); - // -h: shared library name. - const char* - soname() const - { return this->soname_; } + DEFINE_bool(demangle, options::TWO_DASHES, '\0', + getenv("COLLECT_NO_DEMANGLE") == NULL, + _("Demangle C++ symbols in log messages"), + _("Do not demangle C++ symbols in log messages")); - // -I: dynamic linker name. - const char* - dynamic_linker() const - { return this->dynamic_linker_; } + DEFINE_bool(detect_odr_violations, options::TWO_DASHES, '\0', false, + _("Try to detect violations of the One Definition Rule"), + NULL); + + DEFINE_string(entry, options::TWO_DASHES, 'e', NULL, + _("Set program start address"), _("ADDRESS")); + + DEFINE_bool(export_dynamic, options::TWO_DASHES, 'E', false, + _("Export all dynamic symbols"), NULL); - // -L: Library search path. - typedef std::vector<Search_directory> Dir_list; + DEFINE_bool(eh_frame_hdr, options::TWO_DASHES, '\0', false, + _("Create exception frame header"), NULL); + + DEFINE_string(soname, options::ONE_DASH, 'h', NULL, + _("Set shared library name"), _("FILENAME")); + + DEFINE_string(dynamic_linker, options::TWO_DASHES, 'I', NULL, + _("Set dynamic linker path"), _("PROGRAM")); + + DEFINE_special(library, options::TWO_DASHES, 'l', + _("Search for library LIBNAME"), _("LIBNAME")); - const Dir_list& - library_path() const - { return this->search_path_; } + DEFINE_dirlist(library_path, options::TWO_DASHES, 'L', + _("Add directory to search path"), _("DIR")); + + DEFINE_string(m, options::EXACTLY_ONE_DASH, 'm', "", + _("Ignored for compatibility"), _("EMULATION")); + + DEFINE_string(output, options::TWO_DASHES, 'o', "a.out", + _("Set output file name"), _("FILE")); + + DEFINE_uint(optimize, options::EXACTLY_ONE_DASH, 'O', 0, + _("Optimize output file size"), _("LEVEL")); + + DEFINE_enum(oformat, options::EXACTLY_TWO_DASHES, '\0', "elf", + _("Set output format"), _("[binary]"), + {"elf", "binary"}); + + DEFINE_bool(emit_relocs, options::TWO_DASHES, 'q', false, + _("Generate relocations in output"), NULL); + + DEFINE_bool(relocatable, options::EXACTLY_ONE_DASH, 'r', false, + _("Generate relocatable output"), NULL); + + // -R really means -rpath, but can mean --just-symbols for + // compatibility with GNU ld. -rpath is always -rpath, so we list + // it separately. + DEFINE_special(R, options::EXACTLY_ONE_DASH, 'R', + _("Add DIR to runtime search path"), _("DIR")); + + DEFINE_dirlist(rpath, options::ONE_DASH, '\0', + _("Add DIR to runtime search path"), _("DIR")); + + DEFINE_special(just_symbols, options::TWO_DASHES, '\0', + _("Read only symbol values from FILE"), _("FILE")); + + DEFINE_dirlist(rpath_link, options::TWO_DASHES, '\0', + _("Add DIR to link time shared library search path"), + _("DIR")); + + DEFINE_bool(strip_all, options::TWO_DASHES, 's', false, + _("Strip all symbols"), NULL); + DEFINE_bool(strip_debug_gdb, options::TWO_DASHES, '\0', false, + _("Strip debug symbols that are unused by gdb " + "(at least versions <= 6.7)"), NULL); + DEFINE_bool(strip_debug, options::TWO_DASHES, 'S', false, + _("Strip debugging information"), NULL); + + DEFINE_bool(shared, options::ONE_DASH, '\0', false, + _("Generate shared library"), NULL); + + // This is not actually special in any way, but I need to give it + // a non-standard accessor-function name because 'static' is a keyword. + DEFINE_special(static, options::ONE_DASH, '\0', + _("Do not link against shared libraries"), NULL); + + DEFINE_bool(stats, options::TWO_DASHES, '\0', false, + _("Print resource usage statistics"), NULL); + + DEFINE_string(sysroot, options::TWO_DASHES, '\0', "", + _("Set target system root directory"), _("DIR")); + + DEFINE_uint64(Tbss, options::ONE_DASH, '\0', -1U, + _("Set the address of the bss segment"), _("ADDRESS")); + DEFINE_uint64(Tdata, options::ONE_DASH, '\0', -1U, + _("Set the address of the data segment"), _("ADDRESS")); + DEFINE_uint64(Ttext, options::ONE_DASH, '\0', -1U, + _("Set the address of the text segment"), _("ADDRESS")); + + DEFINE_special(script, options::TWO_DASHES, 'T', + _("Read linker script"), _("FILE")); + DEFINE_special(version_script, options::TWO_DASHES, '\0', + _("Read version script"), _("FILE")); + + DEFINE_bool(threads, options::TWO_DASHES, '\0', false, + _("Run the linker multi-threaded"), + _("Do not run the linker multi-threaded")); + DEFINE_uint(thread_count, options::TWO_DASHES, '\0', 0, + _("Number of threads to use"), _("COUNT")); + DEFINE_uint(thread_count_initial, options::TWO_DASHES, '\0', 0, + _("Number of threads to use in initial pass"), _("COUNT")); + DEFINE_uint(thread_count_middle, options::TWO_DASHES, '\0', 0, + _("Number of threads to use in middle pass"), _("COUNT")); + DEFINE_uint(thread_count_final, options::TWO_DASHES, '\0', 0, + _("Number of threads to use in final pass"), _("COUNT")); + + DEFINE_bool(whole_archive, options::TWO_DASHES, '\0', false, + _("Include all archive contents"), + _("Include only needed archive contents")); + + DEFINE_special(start_group, options::TWO_DASHES, '(', + _("Start a library search group"), NULL); + DEFINE_special(end_group, options::TWO_DASHES, ')', + _("End a library search group"), NULL); + + DEFINE_string(debug, options::TWO_DASHES, '\0', "", + _("Turn on debugging"), _("[task,script,all][,...]")); + + // The -z flags. + + // Both execstack and noexecstack differ from the default execstack_ + // value, so we need to use different variables for them. + DEFINE_bool(execstack, options::DASH_Z, '\0', false, + _("Mark output as requiring executable stack"), NULL); + DEFINE_bool(noexecstack, options::DASH_Z, '\0', false, + _("Mark output as not requiring executable stack"), NULL); + DEFINE_uint64(max_page_size, options::DASH_Z, '\0', 0, + _("Set maximum page size to SIZE"), _("SIZE")); + DEFINE_uint64(common_page_size, options::DASH_Z, '\0', 0, + _("Set common page size to SIZE"), _("SIZE")); - // -O: optimization level (0: don't try to optimize output size). - int - optimize() const - { return this->optimization_level_; } + public: + typedef options::Dir_list Dir_list; - // -o: Output file name. - const char* - output_file_name() const - { return this->output_file_name_; } + General_options(); - // --oformat: Output format. - Object_format - oformat_enum() const - { return this->oformat_; } + // Does post-processing on flags, making sure they all have + // non-conflicting values. Also converts some flags from their + // "standard" types (string, etc), to another type (enum, DirList), + // which can be accessed via a separate method. Dies if it notices + // any problems. + void finalize(); + // The macro defines output() (based on --output), but that's a + // generic name. Provide this alternative name, which is clearer. const char* - oformat() const - { return this->oformat_string_; } - - // Return the default target. - Target* - default_target() const; - - // -q: Whether to emit relocations. - bool - emit_relocs() const - { return this->emit_relocs_; } - - // -r: Whether we are doing a relocatable link. - bool - relocatable() const - { return this->is_relocatable_; } - - // -s: Strip all symbols. - bool - strip_all() const - { return this->strip_ == STRIP_ALL; } - - // -S: Strip debugging information. - bool - strip_debug() const - { return this->strip_ == STRIP_ALL || this->strip_ == STRIP_DEBUG; } - - // --strip-debug-gdb: strip only debugging information that's not - // used by gdb (at least, for gdb versions <= 6.7). - bool - strip_debug_gdb() const - { return this->strip_debug() || this->strip_ == STRIP_DEBUG_UNUSED_BY_GDB; } - - // --allow-shlib-undefined: do not warn about unresolved symbols in - // --shared libraries. - bool - allow_shlib_undefined() const - { return this->allow_shlib_undefined_; } - - // -Bsymbolic: bind defined symbols locally. - bool - Bsymbolic() const - { return this->symbolic_; } - - // --compress-debug-sections: compress .debug_* sections in the - // output file using the given compression method. This is useful - // when the tools (such as gdb) support compressed sections. - bool - compress_debug_sections() const - { return this->compress_debug_sections_ != NO_COMPRESSION; } - - bool - zlib_compress_debug_sections() const - { return this->compress_debug_sections_ == ZLIB_COMPRESSION; } - - // --demangle: demangle C++ symbols in our log messages. - bool - demangle() const - { return this->demangle_; } - - // --detect-odr-violations: Whether to search for One Defn Rule violations. - bool - detect_odr_violations() const - { return this->detect_odr_violations_; } - - // --eh-frame-hdr: Whether to generate an exception frame header. - bool - eh_frame_hdr() const - { return this->create_eh_frame_hdr_; } - - // --rpath: The runtime search path. - const Dir_list& - rpath() const - { return this->rpath_; } - - // --rpath-link: The link time search patch for shared libraries. - const Dir_list& - rpath_link() const - { return this->rpath_link_; } - - // --shared: Whether generating a shared object. - bool - shared() const - { return this->is_shared_; } + output_file_name() const + { return this->output(); } // This is not defined via a flag, but combines flags to say whether // the output is position-independent or not. @@ -260,500 +604,121 @@ class General_options output_is_position_independent() const { return this->shared(); } - // --static: Whether doing a static link. + // This would normally be static(), and defined automatically, but + // since static is a keyword, we need to come up with our own name. bool is_static() const - { return this->is_static_; } - - // --stats: Print resource usage statistics. - bool - stats() const - { return this->print_stats_; } - - // --sysroot: The system root of a cross-linker. - const std::string& - sysroot() const - { return this->sysroot_; } - - // -Tbss: The address of the BSS segment - uint64_t - Tbss() const - { return this->bss_segment_address_; } + { return static_; } - // Whether -Tbss was used. - bool - user_set_Tbss() const - { return this->bss_segment_address_ != -1U; } - - // -Tdata: The address of the data segment - uint64_t - Tdata() const - { return this->data_segment_address_; } - - // Whether -Tdata was used. - bool - user_set_Tdata() const - { return this->data_segment_address_ != -1U; } - - // -Ttext: The address of the .text section - uint64_t - Ttext() const - { return this->text_segment_address_; } - - // Whether -Ttext was used. - bool - user_set_Ttext() const - { return this->text_segment_address_ != -1U; } - - // --threads: Whether to use threads. - bool - threads() const - { return this->threads_; } - - // --thread-count-initial: Threads to use in initial pass. - int - thread_count_initial() const - { return this->thread_count_initial_; } - - // --thread-count-middle: Threads to use in middle pass. - int - thread_count_middle() const - { return this->thread_count_middle_; } + // In addition to getting the input and output formats as a string + // (via format() and oformat()), we also give access as an enum. + enum Object_format + { + // Ordinary ELF. + OBJECT_FORMAT_ELF, + // Straight binary format. + OBJECT_FORMAT_BINARY + }; - // --thread-count-final: Threads to use in final pass. - int - thread_count_final() const - { return this->thread_count_final_; } + // Note: these functions are not very fast. + Object_format format_enum() const; + Object_format oformat_enum() const; - // -z execstack, -z noexecstack + // These are the best way to get access to the execstack state, + // not execstack() and noexecstack() which are hard to use properly. bool is_execstack_set() const - { return this->execstack_ != EXECSTACK_FROM_INPUT; } + { return this->execstack_status_ != EXECSTACK_FROM_INPUT; } bool is_stack_executable() const - { return this->execstack_ == EXECSTACK_YES; } - - // -z max-page-size - uint64_t - max_page_size() const - { return this->max_page_size_; } - - // -z common-page-size - uint64_t - common_page_size() const - { return this->common_page_size_; } - - // --debug - unsigned int - debug() const - { return this->debug_; } + { return this->execstack_status_ == EXECSTACK_YES; } private: // Don't copy this structure. General_options(const General_options&); General_options& operator=(const General_options&); - friend class Command_line; - friend class options::Command_line_options; - - // Which symbols to strip. - enum Strip - { - // Don't strip any symbols. - STRIP_NONE, - // Strip all symbols. - STRIP_ALL, - // Strip debugging information. - STRIP_DEBUG, - // Strip debugging information that's not used by gdb (at least <= 6.7) - STRIP_DEBUG_UNUSED_BY_GDB - }; - // Whether to mark the stack as executable. enum Execstack { // Not set on command line. EXECSTACK_FROM_INPUT, - // Mark the stack as executable. + // Mark the stack as executable (-z execstack). EXECSTACK_YES, - // Mark the stack as not executable. + // Mark the stack as not executable (-z noexecstack). EXECSTACK_NO }; - // What compression method to use - enum CompressionMethod - { - NO_COMPRESSION, - ZLIB_COMPRESSION, - }; - - void - set_define_common(bool value) - { - this->define_common_ = value; - this->user_set_define_common_ = true; - } - - void - set_no_define_common(bool value) - { this->set_define_common(!value); } - - bool - user_set_define_common() const - { return this->user_set_define_common_; } - - void - set_entry(const char* arg) - { this->entry_ = arg; } - - void - set_export_dynamic(bool value) - { this->export_dynamic_ = value; } - - void - set_soname(const char* arg) - { this->soname_ = arg; } - - void - set_dynamic_linker(const char* arg) - { this->dynamic_linker_ = arg; } - - void - add_to_search_path(const char* arg) - { this->search_path_.push_back(Search_directory(arg, false)); } - - void - add_to_search_path_with_sysroot(const char* arg) - { this->search_path_.push_back(Search_directory(arg, true)); } - - void - set_optimize(const char* arg) - { - char* endptr; - this->optimization_level_ = strtol(arg, &endptr, 0); - if (*endptr != '\0' || this->optimization_level_ < 0) - gold_fatal(_("invalid optimization level: %s"), arg); - } - - void - set_output(const char* arg) - { this->output_file_name_ = arg; } - - void - set_oformat(const char*); - - void - set_emit_relocs(bool value) - { this->emit_relocs_ = value; } - - void - set_relocatable(bool value) - { this->is_relocatable_ = value; } - - void - set_strip_all(bool) - { this->strip_ = STRIP_ALL; } - - // Note: normalize_options() depends on the fact that this turns off - // STRIP_ALL if it were already set. - void - set_strip_debug(bool) - { this->strip_ = STRIP_DEBUG; } - - void - set_strip_debug_gdb(bool) - { this->strip_ = STRIP_DEBUG_UNUSED_BY_GDB; } - - void - set_allow_shlib_undefined(bool value) - { this->allow_shlib_undefined_ = value; } - - void - set_no_allow_shlib_undefined(bool value) - { this->set_allow_shlib_undefined(!value); } - - void - set_Bsymbolic(bool value) - { this->symbolic_ = value; } - - void set_compress_debug_sections(const char* arg) - { - if (strcmp(arg, "none") == 0) - this->compress_debug_sections_ = NO_COMPRESSION; -#ifdef HAVE_ZLIB_H - else if (strcmp(arg, "zlib") == 0) - this->compress_debug_sections_ = ZLIB_COMPRESSION; -#endif - else - gold_fatal(_("unsupported argument to --compress-debug-sections: %s"), - arg); - } - - void - add_to_defsym(const char* arg); - - void - set_demangle(bool value) - { this->demangle_ = value; } - - void - set_no_demangle(bool value) - { this->set_demangle(!value); } - - void - set_detect_odr_violations(bool value) - { this->detect_odr_violations_ = value; } - - void - set_eh_frame_hdr(bool value) - { this->create_eh_frame_hdr_ = value; } - - void - add_to_rpath(const char* arg) - { this->rpath_.push_back(Search_directory(arg, false)); } - - void - add_to_rpath_link(const char* arg) - { this->rpath_link_.push_back(Search_directory(arg, false)); } - + Execstack execstack_status_; void - set_shared(bool value) - { this->is_shared_ = value; } + set_execstack_status(Execstack value) + { execstack_status_ = value; } + bool static_; void set_static(bool value) - { this->is_static_ = value; } - - void - set_stats(bool value) - { this->print_stats_ = value; } - - void - set_sysroot(const char* arg) - { this->sysroot_ = arg; } - - void - set_segment_address(const char* name, const char* arg, uint64_t* val) - { - char* endptr; - *val = strtoull(arg, &endptr, 0); - if (*endptr != '\0' || *val == -1U) - gold_fatal(_("invalid argument to %s: %s"), name, arg); - } - - void - set_Tbss(const char* arg) - { this->set_segment_address("-Tbss", arg, &this->bss_segment_address_); } - - void - set_Tdata(const char* arg) - { this->set_segment_address("-Tdata", arg, &this->data_segment_address_); } - - void - set_Ttext(const char* arg) - { this->set_segment_address("-Ttext", arg, &this->text_segment_address_); } - - int - parse_thread_count(const char* arg) - { - char* endptr; - const int count = strtol(arg, &endptr, 0); - if (*endptr != '\0' || count < 0) - gold_fatal(_("invalid thread count: %s"), arg); - return count; - } - - void - set_threads(bool value) - { -#ifndef ENABLE_THREADS - if (value) - gold_fatal(_("--threads not supported")); -#endif - this->threads_ = value; - } - - void - set_no_threads(bool value) - { this->set_threads(!value); } - - void - set_thread_count(const char* arg) - { - int count = this->parse_thread_count(arg); - this->thread_count_initial_ = count; - this->thread_count_middle_ = count; - this->thread_count_final_ = count; - } - - void - set_thread_count_initial(const char* arg) - { this->thread_count_initial_ = this->parse_thread_count(arg); } - - void - set_thread_count_middle(const char* arg) - { this->thread_count_middle_ = this->parse_thread_count(arg); } - - void - set_thread_count_final(const char* arg) - { this->thread_count_final_ = this->parse_thread_count(arg); } - - void - ignore(const char*) - { } + { static_ = value; } + // These are called by finalize() to set up the search-path correctly. void - set_execstack(bool) - { this->execstack_ = EXECSTACK_YES; } - - void - set_noexecstack(bool) - { this->execstack_ = EXECSTACK_NO; } - - void - set_max_page_size(const char* arg) - { - char* endptr; - this->max_page_size_ = strtoull(arg, &endptr, 0); - if (*endptr != '\0' || this->max_page_size_ == 0) - gold_fatal(_("invalid max-page-size: %s"), arg); - } - - void - set_common_page_size(const char* arg) - { - char* endptr; - this->common_page_size_ = strtoull(arg, &endptr, 0); - if (*endptr != '\0' || this->common_page_size_ == 0) - gold_fatal(_("invalid common-page-size: %s"), arg); - } - - void - set_debug(unsigned int flags) - { this->debug_ = flags; } - - // Handle the -z option. - void - handle_z_option(const char*); - - // Handle the --debug option. - void - handle_debug_option(const char*); + add_to_library_path_with_sysroot(const char* arg) + { this->add_search_directory_to_library_path(Search_directory(arg, true)); } // Apply any sysroot to the directory lists. void add_sysroot(); - - bool define_common_; - bool user_set_define_common_; - const char* entry_; - bool export_dynamic_; - const char* soname_; - const char* dynamic_linker_; - Dir_list search_path_; - int optimization_level_; - const char* output_file_name_; - Object_format oformat_; - const char* oformat_string_; - bool emit_relocs_; - bool is_relocatable_; - Strip strip_; - bool allow_shlib_undefined_; - bool symbolic_; - CompressionMethod compress_debug_sections_; - bool demangle_; - bool detect_odr_violations_; - bool create_eh_frame_hdr_; - Dir_list rpath_; - Dir_list rpath_link_; - bool is_shared_; - bool is_static_; - bool print_stats_; - std::string sysroot_; - uint64_t bss_segment_address_; - uint64_t data_segment_address_; - uint64_t text_segment_address_; - bool threads_; - int thread_count_initial_; - int thread_count_middle_; - int thread_count_final_; - Execstack execstack_; - uint64_t max_page_size_; - uint64_t common_page_size_; - unsigned int debug_; }; -// The current state of the position dependent options. +// The position-dependent options. We use this to store the state of +// the commandline at a particular point in parsing for later +// reference. For instance, if we see "ld --whole-archive foo.a +// --no-whole-archive," we want to store the whole-archive option with +// foo.a, so when the time comes to parse foo.a we know we should do +// it in whole-archive mode. We could store all of General_options, +// but that's big, so we just pick the subset of flags that actually +// change in a position-dependent way. + +#define DEFINE_posdep(varname__, type__) \ + public: \ + type__ \ + varname__() const \ + { return this->varname__##_; } \ + \ + void \ + set_##varname__(type__ value) \ + { this->varname__##_ = value; } \ + private: \ + type__ varname__##_ class Position_dependent_options { public: - typedef General_options::Object_format Object_format; - - Position_dependent_options(); - - // -Bdynamic/-Bstatic: Whether we are searching for a static archive - // -rather than a shared object. - bool - Bdynamic() const - { return !this->do_static_search_; } - - // --as-needed: Whether to add a DT_NEEDED argument only if the - // dynamic object is used. - bool - as_needed() const - { return this->as_needed_; } - - // --whole-archive: Whether to include the entire contents of an - // --archive. - bool - whole_archive() const - { return this->include_whole_archive_; } - - // --format: The format of the input file. - Object_format - format_enum() const - { return this->input_format_; } - - void - set_Bstatic(bool value) - { this->do_static_search_ = value; } - - void - set_Bdynamic(bool value) - { this->set_Bstatic(!value); } + Position_dependent_options(const General_options& options + = Position_dependent_options::default_options_) + { copy_from_options(options); } - void - set_as_needed(bool value) - { this->as_needed_ = value; } - - void - set_no_as_needed(bool value) - { this->set_as_needed(!value); } - - void - set_whole_archive(bool value) - { this->include_whole_archive_ = value; } - - void - set_no_whole_archive(bool value) - { this->set_whole_archive(!value); } - - void - set_format(const char*); + void copy_from_options(const General_options& options) + { + this->set_as_needed(options.as_needed()); + this->set_Bdynamic(options.Bdynamic()); + this->set_format_enum(options.format_enum()); + this->set_whole_archive(options.whole_archive()); + } - void - set_format_enum(Object_format value) - { this->input_format_ = value; } + DEFINE_posdep(as_needed, bool); + DEFINE_posdep(Bdynamic, bool); + DEFINE_posdep(format_enum, General_options::Object_format); + DEFINE_posdep(whole_archive, bool); private: - bool do_static_search_; - bool as_needed_; - bool include_whole_archive_; - Object_format input_format_; + // This is a General_options with everything set to its default + // value. A Position_dependent_options created with no argument + // will take its values from here. + static General_options default_options_; }; + // A single file or library argument from the command line. class Input_file_argument @@ -775,8 +740,20 @@ class Input_file_argument Input_file_argument(const char* name, bool is_lib, const char* extra_search_path, - bool just_symbols, - const Position_dependent_options& options) + bool just_symbols, + const Position_dependent_options& options) + : name_(name), is_lib_(is_lib), extra_search_path_(extra_search_path), + just_symbols_(just_symbols), options_(options) + { } + + // You can also pass in a General_options instance instead of a + // Position_dependent_options. In that case, we extract the + // position-independent vars from the General_options and only store + // those. + Input_file_argument(const char* name, bool is_lib, + const char* extra_search_path, + bool just_symbols, + const General_options& options) : name_(name), is_lib_(is_lib), extra_search_path_(extra_search_path), just_symbols_(just_symbols), options_(options) { } @@ -798,7 +775,7 @@ class Input_file_argument { return (this->extra_search_path_.empty() ? NULL - : this->extra_search_path_.c_str()); + : this->extra_search_path_.c_str()); } // Return whether we should only read symbols from this file. @@ -963,7 +940,13 @@ class Input_arguments bool in_group_; }; -// All the information read from the command line. + +// All the information read from the command line. These are held in +// three separate structs: one to hold the options (--foo), one to +// hold the filenames listed on the commandline, and one to hold +// linker script information. This third is not a subset of the other +// two because linker scripts can be specified either as options (via +// -T) or as a file. class Command_line { @@ -975,43 +958,14 @@ class Command_line // Process the command line options. This will exit with an // appropriate error message if an unrecognized option is seen. void - process(int argc, char** argv); + process(int argc, const char** argv); // Process one command-line option. This takes the index of argv to - // process, and returns the index for the next option. - int - process_one_option(int argc, char** argv, int i, bool* no_more_options); - - // Handle a -l option. + // process, and returns the index for the next option. no_more_options + // is set to true if argv[i] is "--". int - process_l_option(int, char**, char*, bool); - - // Handle a -R option when it means --rpath. - void - add_to_rpath(const char* arg) - { this->options_.add_to_rpath(arg); } - - // Add a file for which we just read the symbols. - void - add_just_symbols_file(const char* arg) - { - this->inputs_.add_file(Input_file_argument(arg, false, "", true, - this->position_options_)); - } - - // Handle a --start-group option. - void - start_group(const char* arg); - - // Handle a --end-group option. - void - end_group(const char* arg); - - // Get an option argument--a helper function for special processing. - const char* - get_special_argument(const char* longname, int argc, char** argv, - const char* arg, bool long_option, - int *pret); + process_one_option(int argc, const char** argv, int i, + bool* no_more_options); // Get the general options. const General_options& @@ -1033,6 +987,11 @@ class Command_line version_script() const { return *this->script_options_.version_script_info(); } + // Get the input files. + Input_arguments& + inputs() + { return this->inputs_; } + // The number of input files. int number_of_input_files() const @@ -1052,27 +1011,6 @@ class Command_line Command_line(const Command_line&); Command_line& operator=(const Command_line&); - // Report usage error. - void - usage() ATTRIBUTE_NORETURN; - void - usage(const char* msg, const char* opt) ATTRIBUTE_NORETURN; - void - usage(const char* msg, char opt) ATTRIBUTE_NORETURN; - - // Apply a command line option. - void - apply_option(const gold::options::One_option&, const char*); - - // Add a file. - void - add_file(const char* name, bool is_lib); - - // Examine the result of processing the command-line, and verify - // the flags do not contradict each other or are otherwise illegal. - void - normalize_options(); - General_options options_; Position_dependent_options position_options_; Script_options script_options_; diff --git a/gold/parameters.cc b/gold/parameters.cc index fdd5fd7..f240c1d 100644 --- a/gold/parameters.cc +++ b/gold/parameters.cc @@ -22,6 +22,7 @@ #include "gold.h" +#include "debug.h" #include "options.h" #include "target.h" #include "target-select.h" @@ -41,8 +42,9 @@ Parameters::set_options(const General_options* options) { gold_assert(!this->options_valid()); this->options_ = options; - // For speed, we make our own copy of the debug variable. - this->debug_ = this->options().debug(); + // For speed, we convert the options() debug var from a string to an + // enum (from debug.h). + this->debug_ = debug_string_to_enum(this->options().debug()); } void diff --git a/gold/script.cc b/gold/script.cc index 2ce14a5..b8ecf9d 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -2131,7 +2131,7 @@ script_parse_option(void* closurev, const char* option, size_t length) else { bool past_a_double_dash_option = false; - char* mutable_option = strndup(option, length); + const char* mutable_option = strndup(option, length); gold_assert(mutable_option != NULL); closure->command_line()->process_one_option(1, &mutable_option, 0, &past_a_double_dash_option); |