* i386.cc (Target_i386::got_section): If -z now, make .got.plt a

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

diff --git a/gold/reloc.h b/gold/reloc.h
index 2229421bbb024a81ae2190056aa6ab42d4335fad..3a33c9b01ba40bd60a8e1cfdfa61056debc2ef64 100644 (file)
--- a/gold/reloc.h
+++ b/gold/reloc.h
@@ -1,6 +1,6 @@
 // reloc.h -- relocate input files for gold   -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -47,7 +47,7 @@ template<int size>
 class Sized_symbol;
 
 template<int size, bool big_endian>
-class Sized_relobj;
+class Sized_relobj_file;
 
 template<int size>
 class Symbol_value;
@@ -62,13 +62,13 @@ class Output_data_reloc;
 class Read_relocs : public Task
 {
  public:
-  // SYMTAB_LOCK is used to lock the symbol table.  BLOCKER should be
-  // unblocked when the Scan_relocs task completes.
-  Read_relocs(const General_options& options, Symbol_table* symtab,
-             Layout* layout, Relobj* object, Task_token* symtab_lock,
-             Task_token* blocker)
-    : options_(options), symtab_(symtab), layout_(layout), object_(object),
-      symtab_lock_(symtab_lock), blocker_(blocker)
+  //   THIS_BLOCKER and NEXT_BLOCKER are passed along to a Scan_relocs
+  // or Gc_process_relocs task, so that they run in a deterministic
+  // order.
+  Read_relocs(Symbol_table* symtab, Layout* layout, Relobj* object,
+             Task_token* this_blocker, Task_token* next_blocker)
+    : symtab_(symtab), layout_(layout), object_(object),
+      this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
   // The standard Task methods.
@@ -86,12 +86,11 @@ class Read_relocs : public Task
   get_name() const;
 
  private:
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
   Relobj* object_;
-  Task_token* symtab_lock_;
-  Task_token* blocker_;
+  Task_token* this_blocker_;
+  Task_token* next_blocker_;
 };
 
 // Process the relocs to figure out which sections are garbage.
@@ -100,15 +99,18 @@ class Read_relocs : public Task
 class Gc_process_relocs : public Task
 {
  public:
-  // SYMTAB_LOCK is used to lock the symbol table.  BLOCKER should be
-  // unblocked when the task completes.
-  Gc_process_relocs(const General_options& options, Symbol_table* symtab,
-             Layout* layout, Relobj* object, Read_relocs_data* rd,
-             Task_token* symtab_lock, Task_token* blocker)
-    : options_(options), symtab_(symtab), layout_(layout), object_(object),
-      rd_(rd), symtab_lock_(symtab_lock), blocker_(blocker)
+  // THIS_BLOCKER prevents this task from running until the previous
+  // one is finished.  NEXT_BLOCKER prevents the next task from
+  // running.
+  Gc_process_relocs(Symbol_table* symtab, Layout* layout, Relobj* object,
+                   Read_relocs_data* rd, Task_token* this_blocker,
+                   Task_token* next_blocker)
+    : symtab_(symtab), layout_(layout), object_(object), rd_(rd),
+      this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
+  ~Gc_process_relocs();
+
   // The standard Task methods.
 
   Task_token*
@@ -124,13 +126,12 @@ class Gc_process_relocs : public Task
   get_name() const;
 
  private:
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
   Relobj* object_;
   Read_relocs_data* rd_;
-  Task_token* symtab_lock_;
-  Task_token* blocker_;
+  Task_token* this_blocker_;
+  Task_token* next_blocker_;
 };
 
 // Scan the relocations for an object to see if they require any
@@ -139,15 +140,18 @@ class Gc_process_relocs : public Task
 class Scan_relocs : public Task
 {
  public:
-  // SYMTAB_LOCK is used to lock the symbol table.  BLOCKER should be
-  // unblocked when the task completes.
-  Scan_relocs(const General_options& options, Symbol_table* symtab,
-             Layout* layout, Relobj* object, Read_relocs_data* rd,
-             Task_token* symtab_lock, Task_token* blocker)
-    : options_(options), symtab_(symtab), layout_(layout), object_(object),
-      rd_(rd), symtab_lock_(symtab_lock), blocker_(blocker)
+  // THIS_BLOCKER prevents this task from running until the previous
+  // one is finished.  NEXT_BLOCKER prevents the next task from
+  // running.
+  Scan_relocs(Symbol_table* symtab, Layout* layout, Relobj* object,
+             Read_relocs_data* rd, Task_token* this_blocker,
+             Task_token* next_blocker)
+    : symtab_(symtab), layout_(layout), object_(object), rd_(rd),
+      this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
+  ~Scan_relocs();
+
   // The standard Task methods.
 
   Task_token*
@@ -163,13 +167,12 @@ class Scan_relocs : public Task
   get_name() const;
 
  private:
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
   Relobj* object_;
   Read_relocs_data* rd_;
-  Task_token* symtab_lock_;
-  Task_token* blocker_;
+  Task_token* this_blocker_;
+  Task_token* next_blocker_;
 };
 
 // A class to perform all the relocations for an object file.
@@ -177,12 +180,12 @@ class Scan_relocs : public Task
 class Relocate_task : public Task
 {
  public:
-  Relocate_task(const General_options& options, const Symbol_table* symtab,
-               const Layout* layout, Relobj* object, Output_file* of,
+  Relocate_task(const Symbol_table* symtab, const Layout* layout,
+               Relobj* object, Output_file* of,
                Task_token* input_sections_blocker,
                Task_token* output_sections_blocker, Task_token* final_blocker)
-    : options_(options), symtab_(symtab), layout_(layout), object_(object),
-      of_(of), input_sections_blocker_(input_sections_blocker),
+    : symtab_(symtab), layout_(layout), object_(object), of_(of),
+      input_sections_blocker_(input_sections_blocker),
       output_sections_blocker_(output_sections_blocker),
       final_blocker_(final_blocker)
   { }
@@ -202,7 +205,6 @@ class Relocate_task : public Task
   get_name() const;
 
  private:
-  const General_options& options_;
   const Symbol_table* symtab_;
   const Layout* layout_;
   Relobj* object_;
@@ -335,7 +337,7 @@ private:
   template<int valsize>
   static inline void
   rel(unsigned char* view,
-      const Sized_relobj<size, big_endian>* object,
+      const Sized_relobj_file<size, big_endian>* object,
       const Symbol_value<size>* psymval)
   {
     typedef typename elfcpp::Swap<valsize, big_endian>::Valtype Valtype;
@@ -363,7 +365,7 @@ private:
   template<int valsize>
   static inline void
   rela(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval,
        typename elfcpp::Swap<valsize, big_endian>::Valtype addend)
   {
@@ -393,7 +395,7 @@ private:
   template<int valsize>
   static inline void
   pcrel(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval,
        typename elfcpp::Elf_types<size>::Elf_Addr address)
   {
@@ -423,7 +425,7 @@ private:
   template<int valsize>
   static inline void
   pcrela(unsigned char* view,
-        const Sized_relobj<size, big_endian>* object,
+        const Sized_relobj_file<size, big_endian>* object,
         const Symbol_value<size>* psymval,
         typename elfcpp::Swap<valsize, big_endian>::Valtype addend,
         typename elfcpp::Elf_types<size>::Elf_Addr address)
@@ -445,7 +447,7 @@ public:
 
   static inline void
   rel8(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval)
   { This::template rel<8>(view, object, psymval); }
 
@@ -456,7 +458,7 @@ public:
 
   static inline void
   rela8(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval,
        unsigned char addend)
   { This::template rela<8>(view, object, psymval, addend); }
@@ -470,7 +472,7 @@ public:
 
   static inline void
   pcrel8(unsigned char* view,
-        const Sized_relobj<size, big_endian>* object,
+        const Sized_relobj_file<size, big_endian>* object,
         const Symbol_value<size>* psymval,
         typename elfcpp::Elf_types<size>::Elf_Addr address)
   { This::template pcrel<8>(view, object, psymval, address); }
@@ -484,7 +486,7 @@ public:
 
   static inline void
   pcrela8(unsigned char* view,
-         const Sized_relobj<size, big_endian>* object,
+         const Sized_relobj_file<size, big_endian>* object,
          const Symbol_value<size>* psymval,
          unsigned char addend,
          typename elfcpp::Elf_types<size>::Elf_Addr address)
@@ -498,7 +500,7 @@ public:
 
   static inline void
   rel16(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval)
   { This::template rel<16>(view, object, psymval); }
 
@@ -509,7 +511,7 @@ public:
 
   static inline void
   rela16(unsigned char* view,
-        const Sized_relobj<size, big_endian>* object,
+        const Sized_relobj_file<size, big_endian>* object,
         const Symbol_value<size>* psymval,
         elfcpp::Elf_Half addend)
   { This::template rela<16>(view, object, psymval, addend); }
@@ -523,7 +525,7 @@ public:
 
   static inline void
   pcrel16(unsigned char* view,
-         const Sized_relobj<size, big_endian>* object,
+         const Sized_relobj_file<size, big_endian>* object,
          const Symbol_value<size>* psymval,
          typename elfcpp::Elf_types<size>::Elf_Addr address)
   { This::template pcrel<16>(view, object, psymval, address); }
@@ -538,7 +540,7 @@ public:
 
   static inline void
   pcrela16(unsigned char* view,
-          const Sized_relobj<size, big_endian>* object,
+          const Sized_relobj_file<size, big_endian>* object,
           const Symbol_value<size>* psymval,
           elfcpp::Elf_Half addend,
           typename elfcpp::Elf_types<size>::Elf_Addr address)
@@ -552,7 +554,7 @@ public:
 
   static inline void
   rel32(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval)
   { This::template rel<32>(view, object, psymval); }
 
@@ -563,7 +565,7 @@ public:
 
   static inline void
   rela32(unsigned char* view,
-        const Sized_relobj<size, big_endian>* object,
+        const Sized_relobj_file<size, big_endian>* object,
         const Symbol_value<size>* psymval,
         elfcpp::Elf_Word addend)
   { This::template rela<32>(view, object, psymval, addend); }
@@ -577,7 +579,7 @@ public:
 
   static inline void
   pcrel32(unsigned char* view,
-         const Sized_relobj<size, big_endian>* object,
+         const Sized_relobj_file<size, big_endian>* object,
          const Symbol_value<size>* psymval,
          typename elfcpp::Elf_types<size>::Elf_Addr address)
   { This::template pcrel<32>(view, object, psymval, address); }
@@ -592,7 +594,7 @@ public:
 
   static inline void
   pcrela32(unsigned char* view,
-          const Sized_relobj<size, big_endian>* object,
+          const Sized_relobj_file<size, big_endian>* object,
           const Symbol_value<size>* psymval,
           elfcpp::Elf_Word addend,
           typename elfcpp::Elf_types<size>::Elf_Addr address)
@@ -606,7 +608,7 @@ public:
 
   static inline void
   rel64(unsigned char* view,
-       const Sized_relobj<size, big_endian>* object,
+       const Sized_relobj_file<size, big_endian>* object,
        const Symbol_value<size>* psymval)
   { This::template rel<64>(view, object, psymval); }
 
@@ -618,7 +620,7 @@ public:
 
   static inline void
   rela64(unsigned char* view,
-        const Sized_relobj<size, big_endian>* object,
+        const Sized_relobj_file<size, big_endian>* object,
         const Symbol_value<size>* psymval,
         elfcpp::Elf_Xword addend)
   { This::template rela<64>(view, object, psymval, addend); }
@@ -632,7 +634,7 @@ public:
 
   static inline void
   pcrel64(unsigned char* view,
-         const Sized_relobj<size, big_endian>* object,
+         const Sized_relobj_file<size, big_endian>* object,
          const Symbol_value<size>* psymval,
          typename elfcpp::Elf_types<size>::Elf_Addr address)
   { This::template pcrel<64>(view, object, psymval, address); }
@@ -647,7 +649,7 @@ public:
 
   static inline void
   pcrela64(unsigned char* view,
-          const Sized_relobj<size, big_endian>* object,
+          const Sized_relobj_file<size, big_endian>* object,
           const Symbol_value<size>* psymval,
           elfcpp::Elf_Xword addend,
           typename elfcpp::Elf_types<size>::Elf_Addr address)
@@ -676,7 +678,7 @@ class Track_relocs
             unsigned int reloc_type);
 
   // Return the offset in the data section to which the next reloc
-  // applies.  THis returns -1 if there is no next reloc.
+  // applies.  This returns -1 if there is no next reloc.
   off_t
   next_offset() const;
 
@@ -685,6 +687,11 @@ class Track_relocs
   unsigned int
   next_symndx() const;
 
+  // Return the addend of the next reloc.  This returns 0 if there is
+  // no next reloc.
+  uint64_t
+  next_addend() const;
+
   // Advance to OFFSET within the data section, and return the number
   // of relocs which would be skipped.
   int