From fd9d194f0467de25e3d6e6131d641f179d7eb289 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 28 Feb 2009 04:39:57 +0000 Subject: PR 6811 * options.h (class Search_directory): Add is_system_directory. (class General_options): Declare is_in_system_directory. * options.cc (get_relative_sysroot): Make static. (get_default_sysroot): Make static. (General_optoins::is_in_system_directory): New function. * fileread.cc (Input_file::is_in_system_directory): New function. * fileread.h (class Input_file): Declare is_in_system_directory. * object.h (class Object): Add is_in_system_directory. (class Input_objects): Remove system_library_directory_ field. * object.cc (Input_objects::add_object): Don't set system_library_directory_. (input_objects::found_in_system_library_directory): Remove. * symtab.cc (Symbol_table::write_globals): Remove input_objects parameter. Change all callers. (Symbol_table::sized_write_globals): Likewise. (Symbol_table::warn_about_undefined_dynobj_symbol): Likewise. Call Object::is_in_system_directory. * symtab.h (class Symbol_table): Update declarations. --- gold/fileread.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gold/fileread.cc') diff --git a/gold/fileread.cc b/gold/fileread.cc index 36eee6c..13442ff 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -738,6 +738,16 @@ Input_file::name() const return this->input_argument_->name(); } +// Return whether this file is in a system directory. + +bool +Input_file::is_in_system_directory() const +{ + if (this->is_in_sysroot()) + return true; + return parameters->options().is_in_system_directory(this->filename()); +} + // Return whether we are only reading symbols. bool -- cgit v1.1