daily update

[external/binutils.git] / gold / layout.h

diff --git a/gold/layout.h b/gold/layout.h
index 131d6a6..f070039 100644 (file)
--- a/gold/layout.h
+++ b/gold/layout.h
@@ -1,6 +1,6 @@
 // layout.h -- lay out output file sections for gold  -*- C++ -*-
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -28,6 +28,7 @@
 #include <utility>
 #include <vector>
 
+#include "script.h"
 #include "workqueue.h"
 #include "object.h"
 #include "dynobj.h"
@@ -84,7 +85,7 @@ class Layout_task_runner : public Task_function_runner
 class Layout
 {
  public:
-  Layout(const General_options& options);
+  Layout(const General_options& options, Script_options*);
 
   // Given an input section SHNDX, named NAME, with data in SHDR, from
   // the object file OBJECT, return the output section where this
@@ -136,11 +137,16 @@ class Layout
 
   // Create dynamic sections if necessary.
   void
-  create_initial_dynamic_sections(const Input_objects*, Symbol_table*);
+  create_initial_dynamic_sections(Symbol_table*);
 
   // Define __start and __stop symbols for output sections.
   void
-  define_section_symbols(Symbol_table*, const Target*);
+  define_section_symbols(Symbol_table*);
+
+  // Define symbols from any linker script.
+  void
+  define_script_symbols(Symbol_table* symtab)
+  { this->script_options_->add_symbols_to_table(symtab); }
 
   // Return the Stringpool used for symbol names.
   const Stringpool*
@@ -241,6 +247,15 @@ class Layout
   has_static_tls() const
   { return this->has_static_tls_; }
 
+  // Return the options which may be set by a linker script.
+  Script_options*
+  script_options()
+  { return this->script_options_; }
+
+  const Script_options*
+  script_options() const
+  { return this->script_options_; }
+
   // Dump statistical information to stderr.
   void
   print_stats() const;
@@ -304,8 +319,8 @@ class Layout
 
   // Create the dynamic symbol table.
   void
-  create_dynamic_symtab(const Input_objects*, const Target*,
-                        Symbol_table*, Output_section** pdynstr,
+  create_dynamic_symtab(const Input_objects*, Symbol_table*,
+                       Output_section** pdynstr,
                        unsigned int* plocal_dynamic_count,
                        std::vector<Symbol*>* pdynamic_symbols,
                        Versions* versions);
@@ -426,6 +441,8 @@ class Layout
 
   // A reference to the options on the command line.
   const General_options& options_;
+  // Information set by scripts or by command line options.
+  Script_options* script_options_;
   // The output section names.
   Stringpool namepool_;
   // The output symbol names.