X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fdirsearch.h;h=8912b565b6611028408d28b8aed1681758a71c8b;hb=bb82aefe17866cdcb996ae35a3895bb36b4d674b;hp=8b5a91ec38530bd12d37d5e45485eba4c2f943c5;hpb=6cb15b7f89d59fb61780b01ad3de2340f33c3728;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/dirsearch.h b/gold/dirsearch.h
index 8b5a91ec38..8912b565b6 100644
--- a/gold/dirsearch.h
+++ b/gold/dirsearch.h
@@ -1,6 +1,6 @@
 // dirsearch.h -- directory searching for gold  -*- C++ -*-
 
-// Copyright 2006, 2007 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.
@@ -26,12 +26,14 @@
 #include <string>
 #include <list>
 
-#include "workqueue.h"
+#include "options.h"
+#include "token.h"
 
 namespace gold
 {
 
 class General_options;
+class Workqueue;
 
 // A simple interface to manage directories to be searched for
 // libraries.
@@ -39,27 +41,38 @@ class General_options;
 class Dirsearch
 {
  public:
-  Dirsearch();
+  Dirsearch()
+    : directories_(NULL), token_(true)
+  { }
 
-  // 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.  *PINDEX
+  // should be set to zero the first time this is called; it will be
+  // updated with the index of the directory where the file is found,
+  // and that value plus one may be used to find the next file with
+  // the same name(s).
   std::string
-  find(const std::string&, const std::string& n2 = std::string()) const;
+  find(const std::vector<std::string>& names, bool* is_in_sysroot,
+       int* pindex, std::string *found_name) const;
+
+  // Return the blocker token which controls access.
+  Task_token*
+  token()
+  { return &this->token_; }
 
-  // Return a reference to the blocker token which controls access.
-  const Task_token&
-  token() const
-  { return this->token_; }
+  // Search for a file in a directory list.  This is a low-level function and
+  // therefore can be used before options and parameters are set.
+  static std::string
+  find_file_in_dir_list(const std::string& name,
+                        const General_options::Dir_list& directories,
+                        const std::string& extra_search_dir);
 
  private:
   // We can not copy this class.
@@ -67,7 +80,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_;
 };