daily update

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

diff --git a/gold/layout.h b/gold/layout.h
index 37a70db..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"
@@ -67,7 +68,7 @@ class Layout_task_runner : public Task_function_runner
 
   // Run the operation.
   void
-  run(Workqueue*);
+  run(Workqueue*, const Task*);
 
  private:
   Layout_task_runner(const Layout_task_runner&);
@@ -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*
@@ -168,7 +174,12 @@ class Layout
 
   // Finalize the layout after all the input sections have been added.
   off_t
-  finalize(const Input_objects*, Symbol_table*);
+  finalize(const Input_objects*, Symbol_table*, const Task*);
+
+  // Return whether any sections require postprocessing.
+  bool
+  any_postprocessing_sections() const
+  { return this->any_postprocessing_sections_; }
 
   // Return the size of the output file.
   off_t
@@ -236,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;
@@ -283,7 +303,7 @@ class Layout
   // Count the local symbols in the regular symbol table and the dynamic
   // symbol table, and build the respective string pools.
   void
-  count_local_symbols(const Input_objects*);
+  count_local_symbols(const Task*, const Input_objects*);
 
   // Create the output sections for the symbol table.
   void
@@ -299,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);
@@ -368,14 +388,14 @@ class Layout
   // Set the final file offsets of all the sections not associated
   // with a segment.  We set section offsets in three passes: the
   // first handles all allocated sections, the second sections that
-  // can be handled after input-sections are processed, and the last
-  // the late-bound STRTAB sections (probably only shstrtab, which is
-  // the one we care about because it holds section names).
+  // require postprocessing, and the last the late-bound STRTAB
+  // sections (probably only shstrtab, which is the one we care about
+  // because it holds section names).
   enum Section_offset_pass
   {
     BEFORE_INPUT_SECTIONS_PASS,
-    AFTER_INPUT_SECTIONS_PASS,
-    STRTAB_AFTER_INPUT_SECTIONS_PASS
+    POSTPROCESSING_SECTIONS_PASS,
+    STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS
   };
   off_t
   set_section_offsets(off_t, Section_offset_pass pass);
@@ -421,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.
@@ -472,6 +494,8 @@ class Layout
   bool input_without_gnu_stack_note_;
   // Whether we have seen an object file that uses the static TLS model.
   bool has_static_tls_;
+  // Whether any sections require postprocessing.
+  bool any_postprocessing_sections_;
 };
 
 // This task handles writing out data in output sections which is not
@@ -492,11 +516,11 @@ class Write_sections_task : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
@@ -527,11 +551,11 @@ class Write_data_task : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
@@ -562,11 +586,11 @@ class Write_symbols_task : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
@@ -602,11 +626,11 @@ class Write_after_input_sections_task : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
@@ -616,8 +640,6 @@ class Write_after_input_sections_task : public Task
   { return "Write_after_input_sections_task"; }
 
  private:
-  class Write_sections_locker;
-
   Layout* layout_;
   Output_file* of_;
   Task_token* input_sections_blocker_;
@@ -635,7 +657,7 @@ class Close_task_runner : public Task_function_runner
 
   // Run the operation.
   void
-  run(Workqueue*);
+  run(Workqueue*, const Task*);
 
  private:
   Output_file* of_;