This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [gold patch rfa] implement '-l:filename'
Chris Demetriou <cgd@google.com> writes:
> 2009-10-06 Chris Demetriou <cgd@google.com>
>
> * options.h (Input_file_argument::Input_file_type): New enum.
> (Input_file_argument::is_lib_): Replace with...
> (Input_file_argument::type_): New member.
> (Input_file_argument::Input_file_argument): Take Input_file_type
> 'type' rather than boolean 'is_lib' as second argument.
> (Input_file_argument::is_lib): Use type_.
> (Input_file_argument::is_searched_file): New function.
> (Input_file_argument::may_need_search): Handle is_searched_file.
> * options.cc (General_options::parse_library): Support -l:filename.
> (General_options::parse_just_symbols): Update for Input_file_argument
> changes.
> (Command_line::process): Likewise.
> * archive.cc (Archive::get_file_and_offset): Likewise.
> * plugin.cc (Plugin_manager::release_input_file): Likewise.
> * script.cc (read_script_file, script_add_file): Likewise.
> * fileread.cc (Input_file::Input_file): Likewise.
> (Input_file::will_search_for): Handle is_searched_file.
> (Input_file::open): Likewise.
> * readsyms.cc (Read_symbols::get_name): Likewise.
> * testsuite/Makefile.am (searched_file_test): New test.
> * testsuite/Makefile.in: Regenerate.
> * testsuite/searched_file_test.cc: New file.
> * testsuite/searched_file_test_lib.cc: New file.
> - // Case 3: is_lib is true
> - else if (this->input_argument_->is_lib())
> + // Case 3: is_lib is true or is_serached_file is true
> + else if (this->input_argument_->is_lib()
> + || this->input_argument_->is_searched_file())
s/serached/searched/
> public:
> + enum Input_file_type {
Put the '{' on the next line.
> - { return this->is_lib_ || !this->extra_search_path_.empty(); }
> + {
> + return (is_lib()
> + || is_searched_file()
> + || !this->extra_search_path_.empty());
Write
(this->is_lib()
|| this->is_searched_file()
|| this->extra_search_path_.empty());
This is OK with those changes.
Thanks.
Ian