// readsyms.cc -- read input file symbols for gold
-// 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.
#include "archive.h"
#include "script.h"
#include "readsyms.h"
+#include "plugin.h"
namespace gold
{
// If we didn't queue a new task, then we need to explicitly unblock
// the token.
if (!this->do_read_symbols(workqueue))
- workqueue->queue_front(new Unblock_token(this->this_blocker_,
- this->next_blocker_));
+ workqueue->queue_soon(new Unblock_token(this->this_blocker_,
+ this->next_blocker_));
}
// Open the file and read the symbols. Return true if a new task was
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.
+ input_file->file().claim_for_plugin();
+ input_file->file().unlock(this);
+ workqueue->queue_next(new Add_plugin_symbols(this->symtab_,
+ this->layout_,
+ obj,
+ this->this_blocker_,
+ this->next_blocker_));
+ return true;
+ }
+ }
if (read_size >= 4)
{
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;
- // 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
- // include it more than once anyhow. If this is a dynamic
- // object, then including it a second time changes nothing.
- if (this->input_group_ != NULL && !obj->is_dynamic())
- {
- gold_error(_("%s: ordinary object found in input group"),
- input_file->name());
- return false;
- }
-
Read_symbols_data* sd = new Read_symbols_data;
obj->read_symbols(sd);
input_file->file().unlock(this);
- workqueue->queue_front(new Add_symbols(this->input_objects_,
- this->symtab_, this->layout_,
- obj, sd,
- this->this_blocker_,
- this->next_blocker_));
+ // We use queue_next because everything is cached for this
+ // task to run right away if possible.
- return true;
- }
- }
+ workqueue->queue_next(new Add_symbols(this->input_objects_,
+ this->symtab_, this->layout_,
+ obj, sd,
+ this->this_blocker_,
+ this->next_blocker_));
- 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_front(new Add_archive_symbols(this->symtab_,
- this->layout_,
- this->input_objects_,
- arch,
- this->input_group_,
- this->this_blocker_,
- this->next_blocker_));
return true;
}
}
- // 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,
- ehdr_buf, read_size, this->this_blocker_,
- this->next_blocker_))
- return true;
-
- // Here we have to handle any other input file types we need.
- gold_error(_("%s: not an object or archive"),
- input_file->file().filename().c_str());
-
- return false;
+ // 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
+ // read multiple scripts simultaneously, which could lead to
+ // unpredictable changes to the General_options structure.
+
+ workqueue->queue_soon(new Read_script(this->options_,
+ this->symtab_,
+ this->layout_,
+ this->dirpath_,
+ this->input_objects_,
+ this->mapfile_,
+ this->input_group_,
+ this->input_argument_,
+ input_file,
+ this->this_blocker_,
+ this->next_blocker_));
+ return true;
}
// Handle a group. We need to walk through the arguments over and
Task_token* next_blocker = new Task_token(true);
next_blocker->add_blocker();
- workqueue->queue(new Read_symbols(this->options_, this->input_objects_,
- this->symtab_, this->layout_,
- this->dirpath_, arg, input_group,
- this_blocker, next_blocker));
+ workqueue->queue_soon(new Read_symbols(this->options_,
+ this->input_objects_,
+ this->symtab_, this->layout_,
+ this->dirpath_, this->mapfile_,
+ arg, input_group,
+ this_blocker, next_blocker));
this_blocker = next_blocker;
}
const int saw_undefined = this->symtab_->saw_undefined();
- workqueue->queue(new Finish_group(this->input_objects_,
- this->symtab_,
- this->layout_,
- input_group,
- saw_undefined,
- this_blocker,
- this->next_blocker_));
+ workqueue->queue_soon(new Finish_group(this->input_objects_,
+ this->symtab_,
+ this->layout_,
+ this->mapfile_,
+ input_group,
+ saw_undefined,
+ this_blocker,
+ this->next_blocker_));
}
// Return a debugging name for a Read_symbols task.
Task_lock_obj<Archive> tl(this, *p);
(*p)->add_symbols(this->symtab_, this->layout_,
- this->input_objects_);
+ this->input_objects_, this->mapfile_);
}
}
delete this->input_group_;
}
+// Class Read_script
+
+Read_script::~Read_script()
+{
+ if (this->this_blocker_ != NULL)
+ delete this->this_blocker_;
+ // next_blocker_ is deleted by the task associated with the next
+ // input file.
+}
+
+// We are blocked by this_blocker_.
+
+Task_token*
+Read_script::is_runnable()
+{
+ if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
+ return this->this_blocker_;
+ return NULL;
+}
+
+// We don't unlock next_blocker_ here. If the script names any input
+// files, then the last file will be responsible for unlocking it.
+
+void
+Read_script::locks(Task_locker*)
+{
+}
+
+// Read the script, if it is a script.
+
+void
+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->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"),
+ this->input_file_->file().filename().c_str());
+ }
+
+ if (!used_next_blocker)
+ {
+ // Queue up a task to unlock next_blocker. We can't just unlock
+ // it here, as we don't hold the workqueue lock.
+ workqueue->queue_soon(new Unblock_token(NULL, this->next_blocker_));
+ }
+}
+
+// Return a debugging name for a Read_script task.
+
+std::string
+Read_script::get_name() const
+{
+ std::string ret("Read_script ");
+ if (this->input_argument_->file().is_lib())
+ ret += "-l";
+ ret += this->input_argument_->file().name();
+ return ret;
+}
+
} // End namespace gold.
projects / binutils-gdb.git / blobdiff