daily update

[deliverable/binutils-gdb.git] / gold / readsyms.cc

diff --git a/gold/readsyms.cc b/gold/readsyms.cc
index 1658a58888903a2e765a18ab3c26d3921fd92b19..8954837624f8f2595ac0cd43b720739f8a0276fe 100644 (file)
--- a/gold/readsyms.cc
+++ b/gold/readsyms.cc
@@ -1,6 +1,6 @@
 // readsyms.cc -- read input file symbols for gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -32,6 +32,7 @@
 #include "archive.h"
 #include "script.h"
 #include "readsyms.h"
+#include "plugin.h"
 
 namespace gold
 {
@@ -152,13 +153,62 @@ Read_symbols::do_read_symbols(Workqueue* workqueue)
       return false;
     }
 
-  unsigned char ehdr_buf[elfcpp::Elf_sizes<64>::ehdr_size];
-
   int read_size = elfcpp::Elf_sizes<64>::ehdr_size;
   if (filesize < read_size)
     read_size = filesize;
 
-  input_file->file().read(0, read_size, ehdr_buf);
+  const unsigned char* ehdr = input_file->file().get_view(0, 0, read_size,
+                                                         true, false);
+
+  if (read_size >= Archive::sarmag)
+    {
+      bool is_thin_archive
+          = memcmp(ehdr, Archive::armagt, Archive::sarmag) == 0;
+      if (is_thin_archive 
+          || memcmp(ehdr, Archive::armag, Archive::sarmag) == 0)
+       {
+         // This is an archive.
+         Archive* arch = new Archive(this->input_argument_->file().name(),
+                                     input_file, is_thin_archive,
+                                     this->dirpath_, this);
+         arch->setup(this->input_objects_);
+         
+         // Unlock the archive so it can be used in the next task.
+         arch->unlock(this);
+
+         workqueue->queue_next(new Add_archive_symbols(this->symtab_,
+                                                       this->layout_,
+                                                       this->input_objects_,
+                                                       this->mapfile_,
+                                                       arch,
+                                                       this->input_group_,
+                                                       this->this_blocker_,
+                                                       this->next_blocker_));
+         return true;
+       }
+    }
+
+  if (parameters->options().has_plugins())
+    {
+      Pluginobj* obj = parameters->options().plugins()->claim_file(input_file,
+                                                                   0, filesize);
+      if (obj != NULL)
+        {
+          // The input file was claimed by a plugin, and its symbols
+          // have been provided by the plugin.
+
+          // We are done with the file at this point, so unlock it.
+          obj->unlock(this);
+
+          workqueue->queue_next(new Add_symbols(this->input_objects_,
+                                                this->symtab_,
+                                                this->layout_,
+                                                obj, NULL,
+                                                this->this_blocker_,
+                                                this->next_blocker_));
+          return true;
+        }
+    }
 
   if (read_size >= 4)
     {
@@ -167,12 +217,12 @@ Read_symbols::do_read_symbols(Workqueue* workqueue)
          elfcpp::ELFMAG0, elfcpp::ELFMAG1,
          elfcpp::ELFMAG2, elfcpp::ELFMAG3
        };
-      if (memcmp(ehdr_buf, elfmagic, 4) == 0)
+      if (memcmp(ehdr, elfmagic, 4) == 0)
        {
          // This is an ELF object.
 
          Object* obj = make_elf_object(input_file->filename(),
-                                       input_file, 0, ehdr_buf, read_size);
+                                       input_file, 0, ehdr, read_size);
          if (obj == NULL)
            return false;
 
@@ -202,26 +252,6 @@ Read_symbols::do_read_symbols(Workqueue* workqueue)
        }
     }
 
-  if (read_size >= Archive::sarmag)
-    {
-      if (memcmp(ehdr_buf, Archive::armag, Archive::sarmag) == 0)
-       {
-         // This is an archive.
-         Archive* arch = new Archive(this->input_argument_->file().name(),
-                                     input_file);
-         arch->setup(this);
-
-         workqueue->queue_next(new Add_archive_symbols(this->symtab_,
-                                                       this->layout_,
-                                                       this->input_objects_,
-                                                       arch,
-                                                       this->input_group_,
-                                                       this->this_blocker_,
-                                                       this->next_blocker_));
-         return true;
-       }
-    }
-
   // Queue up a task to try to parse this file as a script.  We use a
   // separate task so that the script will be read in order with other
   // objects named on the command line.  Also so that we don't try to
@@ -233,6 +263,7 @@ Read_symbols::do_read_symbols(Workqueue* workqueue)
                                        this->layout_,
                                        this->dirpath_,
                                        this->input_objects_,
+                                       this->mapfile_,
                                        this->input_group_,
                                        this->input_argument_,
                                        input_file,
@@ -268,7 +299,8 @@ Read_symbols::do_group(Workqueue* workqueue)
       workqueue->queue_soon(new Read_symbols(this->options_,
                                             this->input_objects_,
                                             this->symtab_, this->layout_,
-                                            this->dirpath_, arg, input_group,
+                                            this->dirpath_, this->mapfile_,
+                                            arg, input_group,
                                             this_blocker, next_blocker));
       this_blocker = next_blocker;
     }
@@ -277,6 +309,7 @@ Read_symbols::do_group(Workqueue* workqueue)
   workqueue->queue_soon(new Finish_group(this->input_objects_,
                                         this->symtab_,
                                         this->layout_,
+                                        this->mapfile_,
                                         input_group,
                                         saw_undefined,
                                         this_blocker,
@@ -347,6 +380,13 @@ Add_symbols::locks(Task_locker* tl)
 void
 Add_symbols::run(Workqueue*)
 {
+  Pluginobj* pluginobj = this->object_->pluginobj();
+  if (pluginobj != NULL)
+    {
+      this->object_->add_symbols(this->symtab_, this->sd_, this->layout_);
+      return;
+    }
+
   if (!this->input_objects_->add_object(this->object_))
     {
       // FIXME: We need to close the descriptor here.
@@ -355,7 +395,7 @@ Add_symbols::run(Workqueue*)
   else
     {
       this->object_->layout(this->symtab_, this->layout_, this->sd_);
-      this->object_->add_symbols(this->symtab_, this->sd_);
+      this->object_->add_symbols(this->symtab_, this->sd_, this->layout_);
       this->object_->release();
     }
   delete this->sd_;
@@ -405,7 +445,7 @@ Finish_group::run(Workqueue*)
          Task_lock_obj<Archive> tl(this, *p);
 
          (*p)->add_symbols(this->symtab_, this->layout_,
-                           this->input_objects_);
+                           this->input_objects_, this->mapfile_);
        }
     }
 
@@ -453,9 +493,9 @@ Read_script::run(Workqueue* workqueue)
   bool used_next_blocker;
   if (!read_input_script(workqueue, this->options_, this->symtab_,
                         this->layout_, this->dirpath_, this->input_objects_,
-                        this->input_group_, this->input_argument_,
-                        this->input_file_, this->next_blocker_,
-                        &used_next_blocker))
+                        this->mapfile_, this->input_group_,
+                        this->input_argument_, this->input_file_,
+                        this->next_blocker_, &used_next_blocker))
     {
       // Here we have to handle any other input file types we need.
       gold_error(_("%s: not an object or archive"),