merge from gcc

[deliverable/binutils-gdb.git] / gold / script.h

diff --git a/gold/script.h b/gold/script.h
index 26abd463ac416745329cccf66ef7deaad8f8561d..755bb7947df2fb4dbeea082805f8d50b63c5356a 100644 (file)
--- a/gold/script.h
+++ b/gold/script.h
@@ -31,6 +31,7 @@
 #define GOLD_SCRIPT_H
 
 #include <cstdio>
+#include <string>
 #include <vector>
 
 #include "script-sections.h"
@@ -42,7 +43,9 @@ class General_options;
 class Command_line;
 class Symbol_table;
 class Layout;
+class Mapfile;
 class Input_argument;
+class Input_arguments;
 class Input_objects;
 class Input_group;
 class Input_file;
@@ -136,22 +139,17 @@ class Version_script_info
   empty() const
   { return this->version_trees_.empty(); }
 
-  // Return the version associated with the given symbol name.
-  // Strings are allocated out of the stringpool given in the
-  // constructor.  Strings are allocated out of the stringpool given
-  // in the constructor.
-  const std::string&
-  get_symbol_version(const char* symbol) const
-  { return get_symbol_version_helper(symbol, true); }
-
-  // Return whether this symbol matches the local: section of a
-  // version script (it doesn't matter which).
+  // If there is a version associated with SYMBOL, return true, and
+  // set *VERSION to the version.  Otherwise, return false.
+  bool
+  get_symbol_version(const char* symbol, std::string* version) const
+  { return this->get_symbol_version_helper(symbol, true, version); }
+
+  // Return whether this symbol matches the local: section of some
+  // version.
   bool
   symbol_is_local(const char* symbol) const
-  {
-    return (get_symbol_version(symbol).empty()
-            && !get_symbol_version_helper(symbol, false).empty());
-  }
+  { return this->get_symbol_version_helper(symbol, false, NULL); }
 
   // Return the names of versions defined in the version script.
   // Strings are allocated out of the stringpool given in the
@@ -184,8 +182,9 @@ class Version_script_info
   void
   print_expression_list(FILE* f, const Version_expression_list*) const;
 
-  const std::string& get_symbol_version_helper(const char* symbol,
-                                               bool check_global) const;
+  bool get_symbol_version_helper(const char* symbol,
+                                bool check_global,
+                                std::string* pversion) const;
 
   std::vector<struct Version_dependency_list*> dependency_lists_;
   std::vector<struct Version_expression_list*> expression_lists_;
@@ -384,6 +383,26 @@ class Script_options
   Script_sections script_sections_;
 };
 
+// Information about a script input that will persist during the whole linker
+// run. Needed only during an incremental build to retrieve the input files
+// added by this script.
+
+class Script_info
+{
+ public:
+  Script_info(Input_arguments* inputs)
+    : inputs_(inputs)
+  { }
+
+  // Returns the input files included because of this script.
+  Input_arguments*
+  inputs()
+  { return this->inputs_; }
+
+ private:
+  Input_arguments* inputs_;
+};
+
 // FILE was found as an argument on the command line, but was not
 // recognized as an ELF file.  Try to read it as a script.  Return
 // true if the file was handled.  This has to handle /usr/lib/libc.so
@@ -391,8 +410,8 @@ class Script_options
 // whether the function took over NEXT_BLOCKER.
 
 bool
-read_input_script(Workqueue*, const General_options&, Symbol_table*, Layout*,
-                 Dirsearch*, Input_objects*, Input_group*,
+read_input_script(Workqueue*, Symbol_table*, Layout*, Dirsearch*, int,
+                 Input_objects*, Mapfile*, Input_group*,
                  const Input_argument*, Input_file*,
                  Task_token* next_blocker, bool* used_next_blocker);
 
@@ -400,7 +419,7 @@ read_input_script(Workqueue*, const General_options&, Symbol_table*, Layout*,
 // Read it as a script, and execute its contents immediately.
 
 bool
-read_commandline_script(const char* filename, Command_line*);
+read_commandline_script(const char* filename, Command_line* cmdline);
 
 // FILE was found as an argument to --version-script.  Read it as a
 // version script, and store its contents in
@@ -409,6 +428,13 @@ read_commandline_script(const char* filename, Command_line*);
 bool
 read_version_script(const char* filename, Command_line* cmdline);
 
+// FILENAME was found as an argument to --dynamic-list.  Read it as a
+// version script (actually, a versym_node from a version script), and
+// store its contents in DYNAMIC_LIST.
+
+bool
+read_dynamic_list(const char* filename, Command_line* cmdline,
+                  Script_options* dynamic_list);
 
 } // End namespace gold.