// options.c -- handle command line options for gold
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
{
len += printf("-%c", this->shortname);
if (this->helparg)
- {
- // -z takes long-names only.
- gold_assert(this->dashes != DASH_Z);
- len += printf(" %s", gettext(this->helparg));
- }
+ {
+ // -z takes long-names only.
+ gold_assert(this->dashes != DASH_Z);
+ len += printf(" %s", gettext(this->helparg));
+ }
comma = true;
}
if (!this->longname.empty()
&& this->longname[1] == '\0'))
{
if (comma)
- len += printf(", ");
+ 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();
- }
+ {
+ 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 ? '=' : ' ',
- gettext(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 ? '=' : ' ',
+ gettext(this->helparg));
+ }
}
if (len >= 30)
for (; len < 30; ++len)
std::putchar(' ');
- // TODO: if we're boolean, add " (default)" when appropriate.
- printf("%s\n", gettext(this->helpstring));
+ printf("%s", gettext(this->helpstring));
+ if (this->is_default)
+ printf(" (%s)", _("default"));
+ printf("\n");
}
void
{
char* endptr;
*retval = strtol(arg, &endptr, 0);
- if (*endptr != '\0' || retval < 0)
+ if (*endptr != '\0' || *retval < 0)
gold_fatal(_("%s: invalid option value (expected an integer): %s"),
- option_name, arg);
+ option_name, arg);
}
void
*retval = strtol(arg, &endptr, 0);
if (*endptr != '\0')
gold_fatal(_("%s: invalid option value (expected an integer): %s"),
- option_name, arg);
+ option_name, arg);
}
void
*retval = strtoull(arg, &endptr, 0);
if (*endptr != '\0')
gold_fatal(_("%s: invalid option value (expected an integer): %s"),
- option_name, arg);
+ option_name, arg);
}
void
option_name, arg);
}
+void
+parse_percent(const char* option_name, const char* arg, double* retval)
+{
+ char* endptr;
+ *retval = strtod(arg, &endptr) / 100.0;
+ if (*endptr != '\0')
+ gold_fatal(_("%s: invalid option value "
+ "(expected a floating point number): %s"),
+ option_name, arg);
+}
+
void
parse_string(const char* option_name, const char* arg, const char** retval)
{
void
parse_choices(const char* option_name, const char* arg, const char** retval,
- const char* choices[], int num_choices)
+ const char* choices[], int num_choices)
{
for (int i = 0; i < num_choices; i++)
if (strcmp(choices[i], arg) == 0)
{
- *retval = arg;
- return;
+ *retval = arg;
+ return;
}
// If we get here, the user did not enter a valid choice, so we die.
{
choices_list += choices[i];
if (i != num_choices - 1)
- choices_list += ", ";
+ choices_list += ", ";
}
gold_fatal(_("%s: must take one of the following arguments: %s"),
- option_name, choices_list.c_str());
+ option_name, choices_list.c_str());
}
} // End namespace options.
void
General_options::parse_defsym(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
cmdline->script_options().define_symbol(arg);
}
+void
+General_options::parse_discard_all(const char*, const char*,
+ Command_line*)
+{
+ this->discard_locals_ = DISCARD_ALL;
+}
+
+void
+General_options::parse_discard_locals(const char*, const char*,
+ Command_line*)
+{
+ this->discard_locals_ = DISCARD_LOCALS;
+}
+
+void
+General_options::parse_discard_none(const char*, const char*,
+ Command_line*)
+{
+ this->discard_locals_ = DISCARD_NONE;
+}
+
void
General_options::parse_incremental(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->incremental_mode_ = INCREMENTAL_AUTO;
}
void
General_options::parse_no_incremental(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->incremental_mode_ = INCREMENTAL_OFF;
}
void
General_options::parse_incremental_changed(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->implicit_incremental_ = true;
this->incremental_disposition_ = INCREMENTAL_CHANGED;
void
General_options::parse_incremental_unchanged(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->implicit_incremental_ = true;
this->incremental_disposition_ = INCREMENTAL_UNCHANGED;
void
General_options::parse_incremental_unknown(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->implicit_incremental_ = true;
this->incremental_disposition_ = INCREMENTAL_CHECK;
}
+void
+General_options::parse_incremental_startup_unchanged(const char*, const char*,
+ Command_line*)
+{
+ this->implicit_incremental_ = true;
+ this->incremental_startup_disposition_ = INCREMENTAL_UNCHANGED;
+}
+
void
General_options::parse_library(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
Input_file_argument::Input_file_type type;
const char* name;
cmdline->inputs().add_file(file);
}
-#ifdef ENABLE_PLUGINS
void
General_options::parse_plugin(const char*, const char* arg,
- Command_line*)
+ Command_line*)
{
this->add_plugin(arg);
}
void
General_options::parse_plugin_opt(const char*, const char* arg,
- Command_line*)
+ Command_line*)
{
this->add_plugin_option(arg);
}
-#endif // ENABLE_PLUGINS
void
General_options::parse_R(const char* option, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
struct stat s;
if (::stat(arg, &s) != 0 || S_ISDIR(s.st_mode))
void
General_options::parse_just_symbols(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
Input_file_argument file(arg, Input_file_argument::INPUT_FILE_TYPE_FILE,
"", true, *this);
void
General_options::parse_script(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
if (!read_commandline_script(arg, cmdline))
gold::gold_fatal(_("unable to parse script file %s"), arg);
void
General_options::parse_version_script(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
if (!read_version_script(arg, cmdline))
gold::gold_fatal(_("unable to parse version script file %s"), arg);
void
General_options::parse_dynamic_list(const char*, const char* arg,
- Command_line* cmdline)
+ Command_line* cmdline)
{
if (!read_dynamic_list(arg, cmdline, &this->dynamic_list_))
gold::gold_fatal(_("unable to parse dynamic-list script file %s"), arg);
+ this->have_dynamic_list_ = true;
}
void
General_options::parse_start_group(const char*, const char*,
- Command_line* cmdline)
+ Command_line* cmdline)
{
cmdline->inputs().start_group();
}
void
General_options::parse_end_group(const char*, const char*,
- Command_line* cmdline)
+ Command_line* cmdline)
{
cmdline->inputs().end_group();
}
void
General_options::parse_start_lib(const char*, const char*,
- Command_line* cmdline)
+ Command_line* cmdline)
{
cmdline->inputs().start_lib(cmdline->position_dependent_options());
}
void
General_options::parse_end_lib(const char*, const char*,
- Command_line* cmdline)
+ Command_line* cmdline)
{
cmdline->inputs().end_lib();
}
void
General_options::parse_exclude_libs(const char*, const char* arg,
- Command_line*)
+ Command_line*)
{
const char* p = arg;
General_options::Object_format
General_options::string_to_object_format(const char* arg)
{
- if (strncmp(arg, "elf", 3) == 0)
+ if (strncmp(arg, "elf", 3) == 0 || strcmp(arg, "default") == 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; treating as elf "
- "(supported formats: elf, binary)"),
- arg);
+ "(supported formats: elf, binary)"),
+ arg);
return gold::General_options::OBJECT_FORMAT_ELF;
}
}
+const char*
+General_options::object_format_to_string(General_options::Object_format fmt)
+{
+ switch (fmt)
+ {
+ case General_options::OBJECT_FORMAT_ELF:
+ return "elf";
+ case General_options::OBJECT_FORMAT_BINARY:
+ return "binary";
+ default:
+ gold_unreachable();
+ }
+}
+
void
General_options::parse_fix_v4bx(const char*, const char*,
- Command_line*)
+ Command_line*)
{
this->fix_v4bx_ = FIX_V4BX_REPLACE;
}
this->endianness_ = ENDIANNESS_LITTLE;
}
+void
+General_options::copy_from_posdep_options(
+ const Position_dependent_options& posdep)
+{
+ this->set_as_needed(posdep.as_needed());
+ this->set_Bdynamic(posdep.Bdynamic());
+ this->set_format(
+ General_options::object_format_to_string(posdep.format_enum()));
+ this->set_whole_archive(posdep.whole_archive());
+ this->set_incremental_disposition(posdep.incremental_disposition());
+}
+
+void
+General_options::parse_push_state(const char*, const char*, Command_line*)
+{
+ Position_dependent_options* posdep = new Position_dependent_options(*this);
+ this->options_stack_.push_back(posdep);
+}
+
+void
+General_options::parse_pop_state(const char*, const char*, Command_line*)
+{
+ if (this->options_stack_.empty())
+ {
+ gold::gold_error(_("unbalanced --push-state/--pop-state"));
+ return;
+ }
+ Position_dependent_options* posdep = this->options_stack_.back();
+ this->options_stack_.pop_back();
+ this->copy_from_posdep_options(*posdep);
+ delete posdep;
+}
+
} // End namespace gold.
namespace
usage()
{
fprintf(stderr,
- _("%s: use the --help option for usage information\n"),
- gold::program_name);
+ _("%s: use the --help option for usage information\n"),
+ gold::program_name);
::exit(EXIT_FAILURE);
}
usage(const char* msg, const char* opt)
{
fprintf(stderr,
- _("%s: %s: %s\n"),
- gold::program_name, opt, msg);
+ _("%s: %s: %s\n"),
+ gold::program_name, opt, msg);
usage();
}
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);
}
{
char* path = get_relative_sysroot(BINDIR);
if (path == NULL)
- path = get_relative_sysroot(TOOLBINDIR);
+ path = get_relative_sysroot(TOOLBINDIR);
if (path != NULL)
- return path;
+ return path;
}
return sysroot;
// 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** arg, int* i)
{
const char* const this_argv = argv[*i];
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));
+ equals ? equals - option_start : strlen(option_start));
gold::options::Option_map::iterator it
= gold::options::long_options->find(option);
if (this_argv[0] != '-') // no dashes at all: had better be "-z <longopt>"
{
if (retval->dashes != gold::options::DASH_Z)
- return NULL;
+ 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;
+ && 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;
+ && retval->dashes != gold::options::EXACTLY_TWO_DASHES
+ && retval->dashes != gold::options::ONE_DASH)
+ return NULL;
}
// Now that we know the option is good (or else bad in a way that
if (!retval->takes_argument())
{
if (equals)
- usage(_("unexpected argument"), this_argv);
+ usage(_("unexpected argument"), this_argv);
else
- *arg = NULL;
+ *arg = NULL;
}
else
{
if (equals)
- *arg = equals + 1;
+ *arg = equals + 1;
else if (retval->takes_optional_argument())
*arg = retval->default_value;
else if (*i < argc && !equals_only)
- *arg = argv[(*i)++];
+ *arg = argv[(*i)++];
else
- usage(_("missing argument"), this_argv);
+ usage(_("missing argument"), this_argv);
}
return retval;
// 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** arg, int* i)
{
const char* const this_argv = argv[*i];
// We handle -z as a special case.
static gold::options::One_option dash_z("", gold::options::DASH_Z,
- 'z', "", NULL, "Z-OPTION", false,
- NULL);
+ 'z', "", NULL, "Z-OPTION", false,
+ NULL, false);
gold::options::One_option* retval = NULL;
if (this_argv[pos_in_argv_i] == 'z')
retval = &dash_z;
{
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];
+ retval = gold::options::short_options[char_as_int];
}
if (retval == NULL)
*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);
+ ++(*i);
}
else
{
// 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;
+ *arg = this_argv + pos_in_argv_i + 1;
else if (retval->takes_optional_argument())
*arg = retval->default_value;
else if (*i < argc)
- *arg = argv[(*i)++];
+ *arg = argv[(*i)++];
else
- usage(_("missing argument"), this_argv);
+ usage(_("missing argument"), this_argv);
}
// If we're a -z option, we need to parse our argument as a
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);
+ usage(_("unknown -z option"), dash_z_arg);
}
return retval;
do_demangle_(false),
plugins_(NULL),
dynamic_list_(),
+ have_dynamic_list_(false),
incremental_mode_(INCREMENTAL_OFF),
- incremental_disposition_(INCREMENTAL_CHECK),
+ incremental_disposition_(INCREMENTAL_STARTUP),
+ incremental_startup_disposition_(INCREMENTAL_CHECK),
implicit_incremental_(false),
excluded_libs_(),
symbols_to_retain_(),
section_starts_(),
fix_v4bx_(FIX_V4BX_NONE),
- endianness_(ENDIANNESS_NOT_SET)
+ endianness_(ENDIANNESS_NOT_SET),
+ discard_locals_(DISCARD_SEC_MERGE),
+ orphan_handling_enum_(ORPHAN_PLACE)
{
// Turn off option registration once construction is complete.
gold::options::ready_to_register = false;
{
this->set_sysroot(get_default_sysroot());
if (this->sysroot() == NULL || this->sysroot()[0] == '\0')
- return;
+ return;
}
char* canonical_sysroot = lrealpath(this->sysroot());
this->set_do_demangle(getenv("COLLECT_NO_DEMANGLE") == NULL);
}
+ // Parse the --orphan-handling argument.
+ if (this->user_set_orphan_handling())
+ {
+ if (strcmp(this->orphan_handling(), "place") == 0)
+ this->set_orphan_handling_enum(ORPHAN_PLACE);
+ else if (strcmp(this->orphan_handling(), "discard") == 0)
+ this->set_orphan_handling_enum(ORPHAN_DISCARD);
+ else if (strcmp(this->orphan_handling(), "warn") == 0)
+ this->set_orphan_handling_enum(ORPHAN_WARN);
+ else if (strcmp(this->orphan_handling(), "error") == 0)
+ this->set_orphan_handling_enum(ORPHAN_ERROR);
+ }
+
// -M is equivalent to "-Map -".
if (this->print_map() && !this->user_set_Map())
{
if (this->thread_count() > 0 || this->thread_count_initial() > 0
|| this->thread_count_middle() > 0 || this->thread_count_final() > 0)
gold_warning(_("ignoring --thread-count: "
- "%s was compiled without thread support"),
- program_name);
+ "%s was compiled without thread support"),
+ program_name);
#endif
+#ifndef ENABLE_PLUGINS
+ if (this->has_plugins())
+ gold_fatal(_("cannot use --plugin: "
+ "%s was compiled without plugin support"),
+ program_name);
+#endif
+
+ std::string libpath;
if (this->user_set_Y())
{
- std::string s = this->Y();
- if (s.compare(0, 2, "P,") == 0)
- s.erase(0, 2);
+ libpath = this->Y();
+ if (libpath.compare(0, 2, "P,") == 0)
+ libpath.erase(0, 2);
+ }
+ else if (!this->nostdlib())
+ {
+#ifndef NATIVE_LINKER
+#define NATIVE_LINKER 0
+#endif
+ const char* p = LIB_PATH;
+ if (strcmp(p, "::DEFAULT::") != 0)
+ libpath = p;
+ else if (NATIVE_LINKER
+ || this->user_set_sysroot()
+ || *TARGET_SYSTEM_ROOT != '\0')
+ {
+ this->add_to_library_path_with_sysroot("/lib");
+ this->add_to_library_path_with_sysroot("/usr/lib");
+ }
+ else
+ this->add_to_library_path_with_sysroot(TOOLLIBDIR);
+ }
+ if (!libpath.empty())
+ {
size_t pos = 0;
size_t next_pos;
do
{
- next_pos = s.find(':', pos);
+ next_pos = libpath.find(':', pos);
size_t len = (next_pos == std::string::npos
? next_pos
: next_pos - pos);
if (len != 0)
- this->add_to_library_path_with_sysroot(s.substr(pos, len).c_str());
+ this->add_to_library_path_with_sysroot(libpath.substr(pos, len));
pos = next_pos + 1;
}
while (next_pos != std::string::npos);
}
- else if (!this->nostdlib())
- {
- // 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");
- }
// Parse the contents of -retain-symbols-file into a set.
if (this->retain_symbols_file())
std::ifstream in;
in.open(this->retain_symbols_file());
if (!in)
- gold_fatal(_("unable to open -retain-symbols-file file %s: %s"),
- this->retain_symbols_file(), strerror(errno));
+ gold_fatal(_("unable to open -retain-symbols-file file %s: %s"),
+ this->retain_symbols_file(), strerror(errno));
std::string line;
std::getline(in, line); // this chops off the trailing \n, if any
while (in)
- {
- if (!line.empty() && line[line.length() - 1] == '\r') // Windows
- line.resize(line.length() - 1);
- this->symbols_to_retain_.insert(line);
- std::getline(in, line);
- }
+ {
+ if (!line.empty() && line[line.length() - 1] == '\r') // Windows
+ line.resize(line.length() - 1);
+ this->symbols_to_retain_.insert(line);
+ std::getline(in, line);
+ }
}
+ // -Bgroup implies --unresolved-symbols=report-all.
+ if (this->Bgroup() && !this->user_set_unresolved_symbols())
+ this->set_unresolved_symbols("report-all");
+
+ // -shared implies --allow-shlib-undefined. Currently
+ // ---allow-shlib-undefined controls warnings issued based on the
+ // -symbol table. --unresolved-symbols controls warnings issued
+ // -based on relocations.
if (this->shared() && !this->user_set_allow_shlib_undefined())
this->set_allow_shlib_undefined(true);
gold_fatal(_("-shared and -static are incompatible"));
if (this->shared() && this->pie())
gold_fatal(_("-shared and -pie are incompatible"));
+ if (this->pie() && this->is_static())
+ gold_fatal(_("-pie and -static are incompatible"));
if (this->shared() && this->relocatable())
gold_fatal(_("-shared and -r are incompatible"));
if (this->pie() && this->relocatable())
gold_fatal(_("-pie and -r are incompatible"));
+ if (!this->shared())
+ {
+ if (this->filter() != NULL)
+ gold_fatal(_("-F/--filter may not used without -shared"));
+ if (this->any_auxiliary())
+ gold_fatal(_("-f/--auxiliary may not be used without -shared"));
+ }
+
// TODO: implement support for -retain-symbols-file with -r, if needed.
if (this->relocatable() && this->retain_symbols_file())
gold_fatal(_("-retain-symbols-file does not yet work with -r"));
if (this->implicit_incremental_ && this->incremental_mode_ == INCREMENTAL_OFF)
gold_fatal(_("Options --incremental-changed, --incremental-unchanged, "
- "--incremental-unknown require the use of --incremental"));
+ "--incremental-unknown require the use of --incremental"));
+
+ // Check for options that are not compatible with incremental linking.
+ // Where an option can be disabled without seriously changing the semantics
+ // of the link, we turn the option off; otherwise, we issue a fatal error.
+
+ if (this->incremental_mode_ != INCREMENTAL_OFF)
+ {
+ if (this->relocatable())
+ gold_fatal(_("incremental linking is not compatible with -r"));
+ if (this->emit_relocs())
+ gold_fatal(_("incremental linking is not compatible with "
+ "--emit-relocs"));
+ if (this->has_plugins())
+ gold_fatal(_("incremental linking is not compatible with --plugin"));
+ if (this->relro())
+ gold_fatal(_("incremental linking is not compatible with -z relro"));
+ if (this->pie())
+ gold_fatal(_("incremental linking is not compatible with -pie"));
+ if (this->gc_sections())
+ {
+ gold_warning(_("ignoring --gc-sections for an incremental link"));
+ this->set_gc_sections(false);
+ }
+ if (this->icf_enabled())
+ {
+ gold_warning(_("ignoring --icf for an incremental link"));
+ this->set_icf_status(ICF_NONE);
+ }
+ if (strcmp(this->compress_debug_sections(), "none") != 0)
+ {
+ gold_warning(_("ignoring --compress-debug-sections for an "
+ "incremental link"));
+ this->set_compress_debug_sections("none");
+ }
+ }
+
+ // --rosegment-gap implies --rosegment.
+ if (this->user_set_rosegment_gap())
+ this->set_rosegment(true);
// FIXME: we can/should be doing a lot more sanity checking here.
}
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;
}
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);
}
}
int
Command_line::process_one_option(int argc, const char** argv, int i,
- bool* no_more_options)
+ bool* no_more_options)
{
gold_assert(argv[i][0] == '-' && !(*no_more_options));
{
option = parse_short_option(argc, argv, pos_in_argv_i, &arg, &new_i);
if (!option)
- break;
+ break;
option->reader->parse_to_value(argv[i], arg, this, &this->options_);
++pos_in_argv_i;
}
{
this->position_options_.copy_from_options(this->options());
if (no_more_options || argv[i][0] != '-')
- {
+ {
Input_file_argument file(argv[i],
Input_file_argument::INPUT_FILE_TYPE_FILE,
"", false, this->position_options_);
- this->inputs_.add_file(file);
- ++i;
- }
+ this->inputs_.add_file(file);
+ ++i;
+ }
else
- i = process_one_option(argc, argv, i, &no_more_options);
+ i = process_one_option(argc, argv, i, &no_more_options);
}
if (this->inputs_.in_group())
usage();
}
+ if (this->inputs_.in_lib())
+ {
+ fprintf(stderr, _("%s: missing lib end\n"), program_name);
+ usage();
+ }
+
// Normalize the options and ensure they don't contradict each other.
this->options_.finalize();
}
projects / deliverable / binutils-gdb.git / blobdiff