* elflink.c (set_symbol_value): Add isymbuf and locsymcount

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

diff --git a/gold/readsyms.cc b/gold/readsyms.cc
index 0e406fd5c24d51e28dfc8988cc96c0db890829cd..bbeb425f98189e3cbd98018ee81ecce402280c01 100644 (file)
--- a/gold/readsyms.cc
+++ b/gold/readsyms.cc
@@ -86,22 +86,36 @@ Read_symbols::run(Workqueue* workqueue)
 
   // Read enough of the file to pick up the entire ELF header.
 
-  int ehdr_size = elfcpp::Elf_sizes<64>::ehdr_size;
-  off_t bytes;
-  const unsigned char* p = input_file->file().get_view(0, ehdr_size, &bytes);
-  if (bytes >= 4)
+  off_t filesize = input_file->file().filesize();
+
+  if (filesize == 0)
+    {
+      fprintf(stderr, _("%s: %s: file is empty\n"),
+             program_name, input_file->file().filename().c_str());
+      gold_exit(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);
+
+  if (read_size >= 4)
     {
       static unsigned char elfmagic[4] =
        {
          elfcpp::ELFMAG0, elfcpp::ELFMAG1,
          elfcpp::ELFMAG2, elfcpp::ELFMAG3
        };
-      if (memcmp(p, elfmagic, 4) == 0)
+      if (memcmp(ehdr_buf, elfmagic, 4) == 0)
        {
          // This is an ELF object.
 
          Object* obj = make_elf_object(input_file->filename(),
-                                       input_file, 0, p, bytes);
+                                       input_file, 0, ehdr_buf, read_size);
 
          // We don't have a way to record a non-archive in an input
          // group.  If this is an ordinary object file, we can't
@@ -130,9 +144,9 @@ Read_symbols::run(Workqueue* workqueue)
        }
     }
 
-  if (bytes >= Archive::sarmag)
+  if (read_size >= Archive::sarmag)
     {
-      if (memcmp(p, Archive::armag, Archive::sarmag) == 0)
+      if (memcmp(ehdr_buf, Archive::armag, Archive::sarmag) == 0)
        {
          // This is an archive.
          Archive* arch = new Archive(this->input_argument_->file().name(),
@@ -149,18 +163,12 @@ Read_symbols::run(Workqueue* workqueue)
        }
     }
 
-  if (bytes == 0)
-    {
-      fprintf(stderr, _("%s: %s: file is empty\n"),
-             program_name, input_file->file().filename().c_str());
-      gold_exit(false);
-    }
-
   // Try to parse this file as a script.
   if (read_input_script(workqueue, this->options_, this->symtab_,
                        this->layout_, this->dirpath_, this->input_objects_,
                        this->input_group_, this->input_argument_, input_file,
-                       p, bytes, this->this_blocker_, this->next_blocker_))
+                       ehdr_buf, read_size, this->this_blocker_,
+                       this->next_blocker_))
     return;
 
   // Here we have to handle any other input file types we need.