#include "elfcpp.h"
#include "options.h"
#include "dirsearch.h"
+#include "symtab.h"
+#include "object.h"
+#include "archive.h"
+#include "script.h"
#include "readsyms.h"
namespace gold
// Add_symbols task.
}
-// Return whether a Read_symbols task is runnable. We need write
-// access to the symbol table. We can read an ordinary input file
-// immediately. For an archive specified using -l, we have to wait
-// until the search path is complete.
+// Return whether a Read_symbols task is runnable. We can read an
+// ordinary input file immediately. For an archive specified using
+// -l, we have to wait until the search path is complete.
Task::Is_runnable_type
Read_symbols::is_runnable(Workqueue*)
{
- if (this->input_.is_lib() && this->dirpath_.token().is_blocked())
+ if (this->input_argument_->is_file()
+ && this->input_argument_->file().is_lib()
+ && this->dirpath_.token().is_blocked())
return IS_BLOCKED;
return IS_RUNNABLE;
void
Read_symbols::run(Workqueue* workqueue)
{
- // We don't keep track of Input_file objects, so this is a memory
- // leak.
- Input_file* input_file = new Input_file(this->input_);
+ if (this->input_argument_->is_group())
+ {
+ gold_assert(this->input_group_ == NULL);
+ this->do_group(workqueue);
+ return;
+ }
+
+ Input_file* input_file = new Input_file(&this->input_argument_->file());
input_file->open(this->options_, this->dirpath_);
// Read enough of the file to pick up the entire ELF header.
if (memcmp(p, elfmagic, 4) == 0)
{
// This is an ELF object.
- Object* obj = make_elf_object(this->input_.name(), input_file, 0,
- p, bytes);
-
- Read_symbols_data sd = obj->read_symbols();
- workqueue->queue(new Add_symbols(obj, sd, this->this_blocker_,
- this->next_blocker_));
+
+ Object* obj = make_elf_object(input_file->filename(),
+ input_file, 0, p, bytes);
+
+ // 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())
+ {
+ fprintf(stderr,
+ _("%s: %s: ordinary object found in input group\n"),
+ program_name, input_file->name());
+ gold_exit(false);
+ }
+
+ Read_symbols_data* sd = new Read_symbols_data;
+ obj->read_symbols(sd);
+ workqueue->queue_front(new Add_symbols(this->options_,
+ this->input_objects_,
+ this->symtab_, this->layout_,
+ obj, sd,
+ this->this_blocker_,
+ this->next_blocker_));
// Opening the file locked it, so now we need to unlock it.
input_file->file().unlock();
}
}
- // Here we have to handle archives and any other input file
- // types we need.
- gold_fatal("only objects are currently supported", false);
+ if (bytes >= Archive::sarmag)
+ {
+ if (memcmp(p, Archive::armag, Archive::sarmag) == 0)
+ {
+ // This is an archive.
+ Archive* arch = new Archive(this->input_argument_->file().name(),
+ input_file);
+ arch->setup();
+ workqueue->queue(new Add_archive_symbols(this->options_,
+ this->symtab_,
+ this->layout_,
+ this->input_objects_,
+ arch,
+ this->input_group_,
+ this->this_blocker_,
+ this->next_blocker_));
+ return;
+ }
+ }
+
+ 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_))
+ return;
+
+ // Here we have to handle any other input file types we need.
+ fprintf(stderr, _("%s: %s: not an object or archive\n"),
+ program_name, input_file->file().filename().c_str());
+ gold_exit(false);
+}
+
+// Handle a group. We need to walk through the arguments over and
+// over until we don't see any new undefined symbols. We do this by
+// setting off Read_symbols Tasks as usual, but recording the archive
+// entries instead of deleting them. We also start a Finish_group
+// Task which runs after we've read all the symbols. In that task we
+// process the archives in a loop until we are done.
+
+void
+Read_symbols::do_group(Workqueue* workqueue)
+{
+ Input_group* input_group = new Input_group();
+
+ const Input_file_group* group = this->input_argument_->group();
+ Task_token* this_blocker = this->this_blocker_;
+ for (Input_file_group::const_iterator p = group->begin();
+ p != group->end();
+ ++p)
+ {
+ const Input_argument* arg = &*p;
+ gold_assert(arg->is_file());
+
+ Task_token* next_blocker = new Task_token();
+ 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));
+ this_blocker = next_blocker;
+ }
+
+ const int saw_undefined = this->symtab_->saw_undefined();
+ workqueue->queue(new Finish_group(this->options_,
+ this->input_objects_,
+ this->symtab_,
+ this->layout_,
+ input_group,
+ saw_undefined,
+ this_blocker,
+ this->next_blocker_));
}
// Class Add_symbols.
// input file.
}
-// We are blocked by this_blocker_. We block next_blocker_.
+// We are blocked by this_blocker_. We block next_blocker_. We also
+// lock the file.
Task::Is_runnable_type
Add_symbols::is_runnable(Workqueue*)
{
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
return IS_BLOCKED;
+ if (this->object_->is_locked())
+ return IS_LOCKED;
return IS_RUNNABLE;
}
+class Add_symbols::Add_symbols_locker : public Task_locker
+{
+ public:
+ Add_symbols_locker(Task_token& token, Workqueue* workqueue,
+ Object* object)
+ : blocker_(token, workqueue), objlock_(*object)
+ { }
+
+ private:
+ Task_locker_block blocker_;
+ Task_locker_obj<Object> objlock_;
+};
+
Task_locker*
Add_symbols::locks(Workqueue* workqueue)
{
- return new Task_locker_block(*this->next_blocker_, workqueue);
+ return new Add_symbols_locker(*this->next_blocker_, workqueue,
+ this->object_);
}
+// Add the symbols in the object to the symbol table.
+
void
Add_symbols::run(Workqueue*)
{
- this->object_->add_symbols(this->sd_);
+ if (!this->input_objects_->add_object(this->object_))
+ {
+ // FIXME: We need to close the descriptor here.
+ delete this->object_;
+ }
+ else
+ {
+ this->object_->layout(this->options_, this->symtab_, this->layout_,
+ this->sd_);
+ this->object_->add_symbols(this->symtab_, this->sd_);
+ }
+ delete this->sd_;
+ this->sd_ = NULL;
+}
+
+// Class Finish_group.
+
+Finish_group::~Finish_group()
+{
+ if (this->this_blocker_ != NULL)
+ delete this->this_blocker_;
+ // next_blocker_ is deleted by the task associated with the next
+ // input file following the group.
+}
+
+// We need to wait for THIS_BLOCKER_ and unblock NEXT_BLOCKER_.
+
+Task::Is_runnable_type
+Finish_group::is_runnable(Workqueue*)
+{
+ if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
+ return IS_BLOCKED;
+ return IS_RUNNABLE;
+}
+
+Task_locker*
+Finish_group::locks(Workqueue* workqueue)
+{
+ return new Task_locker_block(*this->next_blocker_, workqueue);
+}
+
+// Loop over the archives until there are no new undefined symbols.
+
+void
+Finish_group::run(Workqueue*)
+{
+ int saw_undefined = this->saw_undefined_;
+ while (saw_undefined != this->symtab_->saw_undefined())
+ {
+ saw_undefined = this->symtab_->saw_undefined();
+
+ for (Input_group::const_iterator p = this->input_group_->begin();
+ p != this->input_group_->end();
+ ++p)
+ {
+ Task_lock_obj<Archive> tl(**p);
+
+ (*p)->add_symbols(this->options_, this->symtab_, this->layout_,
+ this->input_objects_);
+ }
+ }
+
+ // Delete all the archives now that we no longer need them.
+ for (Input_group::const_iterator p = this->input_group_->begin();
+ p != this->input_group_->end();
+ ++p)
+ delete *p;
+ delete this->input_group_;
}
} // End namespace gold.
projects / deliverable / binutils-gdb.git / blobdiff