void
General_options::parse_version(const char* opt, const char*, Command_line*)
{
- gold::print_version(opt[0] == '-' && opt[1] == 'v');
- ::exit(EXIT_SUCCESS);
+ bool print_short = (opt[0] == '-' && opt[1] == 'v');
+ gold::print_version(print_short);
+ this->printed_version_ = true;
+ if (!print_short)
+ ::exit(EXIT_SUCCESS);
}
void
General_options::parse_library(const char*, const char* arg,
Command_line* cmdline)
{
- Input_file_argument file(arg, true, "", false, *this);
+ Input_file_argument::Input_file_type type;
+ const char *name;
+ if (arg[0] == ':')
+ {
+ type = Input_file_argument::INPUT_FILE_TYPE_SEARCHED_FILE;
+ name = arg + 1;
+ }
+ else
+ {
+ type = Input_file_argument::INPUT_FILE_TYPE_LIBRARY;
+ name = arg;
+ }
+ Input_file_argument file(name, type, "", false, *this);
cmdline->inputs().add_file(file);
}
General_options::parse_just_symbols(const char*, const char* arg,
Command_line* cmdline)
{
- Input_file_argument file(arg, false, "", true, *this);
+ Input_file_argument file(arg, Input_file_argument::INPUT_FILE_TYPE_FILE,
+ "", true, *this);
cmdline->inputs().add_file(file);
}
+// Handle --section-start.
+
+void
+General_options::parse_section_start(const char*, const char* arg,
+ Command_line*)
+{
+ const char* eq = strchr(arg, '=');
+ if (eq == NULL)
+ {
+ gold_error(_("invalid argument to --section-start; "
+ "must be SECTION=ADDRESS"));
+ return;
+ }
+
+ std::string section_name(arg, eq - arg);
+
+ ++eq;
+ const char* val_start = eq;
+ if (eq[0] == '0' && (eq[1] == 'x' || eq[1] == 'X'))
+ eq += 2;
+ if (*eq == '\0')
+ {
+ gold_error(_("--section-start address missing"));
+ return;
+ }
+ uint64_t addr = 0;
+ hex_init();
+ for (; *eq != '\0'; ++eq)
+ {
+ if (!hex_p(*eq))
+ {
+ gold_error(_("--section-start argument %s is not a valid hex number"),
+ val_start);
+ return;
+ }
+ addr <<= 4;
+ addr += hex_value(*eq);
+ }
+
+ this->section_starts_[section_name] = addr;
+}
+
+// Look up a --section-start value.
+
+bool
+General_options::section_start(const char* secname, uint64_t* paddr) const
+{
+ if (this->section_starts_.empty())
+ return false;
+ std::map<std::string, uint64_t>::const_iterator p =
+ this->section_starts_.find(secname);
+ if (p == this->section_starts_.end())
+ return false;
+ *paddr = p->second;
+ return true;
+}
+
void
General_options::parse_static(const char*, const char*, Command_line*)
{
cmdline->inputs().end_group();
}
+void
+General_options::parse_start_lib(const char*, const char*,
+ Command_line* cmdline)
+{
+ cmdline->inputs().start_lib(cmdline->position_dependent_options());
+}
+
+void
+General_options::parse_end_lib(const char*, const char*,
+ Command_line* cmdline)
+{
+ cmdline->inputs().end_lib();
+}
+
// The function add_excluded_libs() in ld/ldlang.c of GNU ld breaks up a list
// of names seperated by commas or colons and puts them in a linked list.
// We implement the same parsing of names here but store names in an unordered
}
}
+void
+General_options::parse_fix_v4bx(const char*, const char*,
+ Command_line*)
+{
+ this->fix_v4bx_ = FIX_V4BX_REPLACE;
+}
+
+void
+General_options::parse_fix_v4bx_interworking(const char*, const char*,
+ Command_line*)
+{
+ this->fix_v4bx_ = FIX_V4BX_INTERWORKING;
+}
+
} // End namespace gold.
namespace
General_options::General_options()
: printed_version_(false),
- execstack_status_(General_options::EXECSTACK_FROM_INPUT), static_(false),
- do_demangle_(false), plugins_(),
- incremental_disposition_(INCREMENTAL_CHECK), implicit_incremental_(false)
+ execstack_status_(EXECSTACK_FROM_INPUT),
+ icf_status_(ICF_NONE),
+ static_(false),
+ do_demangle_(false),
+ plugins_(NULL),
+ dynamic_list_(),
+ incremental_disposition_(INCREMENTAL_CHECK),
+ implicit_incremental_(false),
+ excluded_libs_(),
+ symbols_to_retain_(),
+ section_starts_(),
+ fix_v4bx_(FIX_V4BX_NONE)
{
// Turn off option registration once construction is complete.
gold::options::ready_to_register = false;
else if (this->noexecstack())
this->set_execstack_status(EXECSTACK_NO);
+ // icf_status_ is a three-state variable; update it based on the
+ // value of this->icf().
+ if (strcmp(this->icf(), "none") == 0)
+ this->set_icf_status(ICF_NONE);
+ else if (strcmp(this->icf(), "safe") == 0)
+ this->set_icf_status(ICF_SAFE);
+ else
+ this->set_icf_status(ICF_ALL);
+
// Handle the optional argument for --demangle.
if (this->user_set_demangle())
{
// Now that we've normalized the options, check for contradictory ones.
if (this->shared() && this->is_static())
gold_fatal(_("-shared and -static are incompatible"));
+ if (this->shared() && this->pie())
+ gold_fatal(_("-shared and -pie 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"));
// 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->oformat_enum() != General_options::OBJECT_FORMAT_ELF
- && (this->shared() || this->relocatable()))
- gold_fatal(_("binary output format not compatible with -shared or -r"));
+ && (this->shared()
+ || this->pie()
+ || this->relocatable()))
+ gold_fatal(_("binary output format not compatible "
+ "with -shared or -pie or -r"));
if (this->user_set_hash_bucket_empty_fraction()
&& (this->hash_bucket_empty_fraction() < 0.0
void
Input_arguments::add_file(const Input_file_argument& file)
{
- if (!this->in_group_)
- this->input_argument_list_.push_back(Input_argument(file));
- else
+ if (this->in_group_)
{
gold_assert(!this->input_argument_list_.empty());
gold_assert(this->input_argument_list_.back().is_group());
this->input_argument_list_.back().group()->add_file(file);
}
+ else if (this->in_lib_)
+ {
+ gold_assert(!this->input_argument_list_.empty());
+ gold_assert(this->input_argument_list_.back().is_lib());
+ this->input_argument_list_.back().lib()->add_file(file);
+ }
+ else
+ this->input_argument_list_.push_back(Input_argument(file));
}
// Start a group.
{
if (this->in_group_)
gold_fatal(_("May not nest groups"));
+ if (this->in_lib_)
+ gold_fatal(_("may not nest groups in libraries"));
Input_file_group* group = new Input_file_group();
this->input_argument_list_.push_back(Input_argument(group));
this->in_group_ = true;
this->in_group_ = false;
}
+// Start a lib.
+
+void
+Input_arguments::start_lib(const Position_dependent_options& options)
+{
+ if (this->in_lib_)
+ gold_fatal(_("may not nest libraries"));
+ if (this->in_group_)
+ gold_fatal(_("may not nest libraries in groups"));
+ Input_file_lib* lib = new Input_file_lib(options);
+ this->input_argument_list_.push_back(Input_argument(lib));
+ this->in_lib_ = true;
+}
+
+// End a lib.
+
+void
+Input_arguments::end_lib()
+{
+ if (!this->in_lib_)
+ gold_fatal(_("lib end without lib start"));
+ this->in_lib_ = false;
+}
+
// Command_line options.
Command_line::Command_line()
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_);
+ Input_file_argument file(argv[i],
+ Input_file_argument::INPUT_FILE_TYPE_FILE,
+ "", false, this->position_options_);
this->inputs_.add_file(file);
++i;
}
this->options_.finalize();
}
+// Finalize the version script options and return them.
+
+const Version_script_info&
+Command_line::version_script()
+{
+ this->options_.finalize_dynamic_list();
+ Version_script_info* vsi = this->script_options_.version_script_info();
+ vsi->finalize();
+ return *vsi;
+}
+
} // End namespace gold.
projects / deliverable / binutils-gdb.git / blobdiff