Full support for --sysroot.

1 files changed, 9 insertions, 10 deletions

diff --git a/gold/dirsearch.h b/gold/dirsearch.h
index 8b5a91e..c1af843 100644
--- a/gold/dirsearch.h
+++ b/gold/dirsearch.h
@@ -39,22 +39,21 @@ class General_options;
 class Dirsearch
 {
  public:
-  Dirsearch();
+  Dirsearch()
+    : directories_(NULL), token_()
+  { }
 
-  // Add a directory to the search path.
+  // Set the list of directories to search.
   void
-  add(Workqueue*, const char*);
-
-  // Add a list of directories to the search path.
-  void
-  add(Workqueue*, const General_options::Dir_list&);
+  initialize(Workqueue*, const General_options::Dir_list*);
 
   // Search for a file, giving one or two names to search for (the
   // second one may be empty).  Return a full path name for the file,
   // or the empty string if it could not be found.  This may only be
-  // called if the token is not blocked.
+  // called if the token is not blocked.  Set *IS_IN_SYSROOT if the
+  // file was found in a directory which is in the sysroot.
   std::string
-  find(const std::string&, const std::string& n2 = std::string()) const;
+  find(const std::string&, const std::string& n2, bool *is_in_sysroot) const;
 
   // Return a reference to the blocker token which controls access.
   const Task_token&
@@ -67,7 +66,7 @@ class Dirsearch
   Dirsearch& operator=(const Dirsearch&);
 
   // Directories to search.
-  std::list<const char*> directories_;
+  const General_options::Dir_list* directories_;
   // Blocker token to control access from tasks.
   Task_token token_;
 };