X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Freadsyms.h;h=01549f1293303263a46afd385ae1eb5e8021dce4;hb=643f7afb0d7f63dcff873d3cbfd7ed3eaf94197f;hp=4956a8233bd59e5ea40c5bcd2b802183434d0359;hpb=b672b0573713e336541cc793af65bf9ea13e9702;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/readsyms.h b/gold/readsyms.h index 4956a8233b..01549f1293 100644 --- a/gold/readsyms.h +++ b/gold/readsyms.h @@ -1,6 +1,6 @@ // readsyms.h -- read input file symbols for gold -*- C++ -*- -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2006-2015 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -27,6 +27,7 @@ #include "workqueue.h" #include "object.h" +#include "incremental.h" namespace gold { @@ -58,12 +59,13 @@ class Read_symbols : public Task Read_symbols(Input_objects* input_objects, Symbol_table* symtab, Layout* layout, Dirsearch* dirpath, int dirindex, Mapfile* mapfile, const Input_argument* input_argument, - Input_group* input_group, Task_token* this_blocker, - Task_token* next_blocker) + Input_group* input_group, Archive_member* member, + Task_token* this_blocker, Task_token* next_blocker) : input_objects_(input_objects), symtab_(symtab), layout_(layout), dirpath_(dirpath), dirindex_(dirindex), mapfile_(mapfile), input_argument_(input_argument), input_group_(input_group), - this_blocker_(this_blocker), next_blocker_(next_blocker) + member_(member), this_blocker_(this_blocker), + next_blocker_(next_blocker) { } ~Read_symbols(); @@ -99,6 +101,14 @@ class Read_symbols : public Task void do_group(Workqueue*); + // Handle --start-lib ... --end-lib + bool + do_lib_group(Workqueue*); + + // Handle --whole-archive --start-lib ... --end-lib --no-whole-archive + bool + do_whole_lib_group(Workqueue*); + // Open and identify the file. bool do_read_symbols(Workqueue*); @@ -111,6 +121,7 @@ class Read_symbols : public Task Mapfile* mapfile_; const Input_argument* input_argument_; Input_group* input_group_; + Archive_member* member_; Task_token* this_blocker_; Task_token* next_blocker_; }; @@ -126,16 +137,14 @@ class Add_symbols : public Task // one for the previous input file. NEXT_BLOCKER is used to prevent // the next task from running. Add_symbols(Input_objects* input_objects, Symbol_table* symtab, - Layout* layout, Dirsearch* dirpath, int dirindex, - Mapfile* mapfile, const Input_argument* input_argument, - Object* object, + Layout* layout, Dirsearch* /*dirpath*/, int /*dirindex*/, + Mapfile* /*mapfile*/, const Input_argument* input_argument, + Object* object, Incremental_library* library, Read_symbols_data* sd, Task_token* this_blocker, Task_token* next_blocker) : input_objects_(input_objects), symtab_(symtab), layout_(layout), - dirpath_(dirpath), dirindex_(dirindex), mapfile_(mapfile), - input_argument_(input_argument), - object_(object), sd_(sd), this_blocker_(this_blocker), - next_blocker_(next_blocker) + input_argument_(input_argument), object_(object), library_(library), + sd_(sd), this_blocker_(this_blocker), next_blocker_(next_blocker) { } ~Add_symbols(); @@ -159,16 +168,149 @@ private: Input_objects* input_objects_; Symbol_table* symtab_; Layout* layout_; - Dirsearch* dirpath_; - int dirindex_; - Mapfile* mapfile_; const Input_argument* input_argument_; Object* object_; + Incremental_library* library_; Read_symbols_data* sd_; Task_token* this_blocker_; Task_token* next_blocker_; }; +// This Task is responsible for reading the symbols from an archive +// member that has changed since the last incremental link. + +class Read_member : public Task +{ + public: + // INPUT is the file to read. INPUT_GROUP is not NULL if we are in + // the middle of an input group. THIS_BLOCKER is used to prevent + // the associated Add_symbols task from running before the previous + // one has completed; it will be NULL for the first task. + // NEXT_BLOCKER is used to block the next input file from adding + // symbols. + Read_member(Input_objects* /*input_objects*/, Symbol_table* /*symtab*/, + Layout* /*layout*/, Mapfile* /*mapfile*/, + const Incremental_binary::Input_reader* input_reader, + Task_token* this_blocker, Task_token* next_blocker) + : input_reader_(input_reader), + this_blocker_(this_blocker), next_blocker_(next_blocker) + { } + + ~Read_member(); + + // The standard Task methods. + + Task_token* + is_runnable(); + + void + locks(Task_locker*); + + void + run(Workqueue*); + + std::string + get_name() const + { + return (std::string("Read_member ") + this->input_reader_->filename()); + } + + private: + const Incremental_binary::Input_reader* input_reader_; + Task_token* this_blocker_; + Task_token* next_blocker_; +}; + +// This Task is responsible for processing an input script file that has +// not changed since the last incremental link. + +class Check_script : public Task +{ + public: + Check_script(Layout* layout, Incremental_binary* ibase, + unsigned int input_file_index, + const Incremental_binary::Input_reader* input_reader, + Task_token* this_blocker, Task_token* next_blocker) + : layout_(layout), ibase_(ibase), input_file_index_(input_file_index), + input_reader_(input_reader), this_blocker_(this_blocker), + next_blocker_(next_blocker) + { + this->filename_ = std::string(this->input_reader_->filename()); + } + + ~Check_script(); + + // The standard Task methods. + + Task_token* + is_runnable(); + + void + locks(Task_locker*); + + void + run(Workqueue*); + + std::string + get_name() const + { + return (std::string("Check_script ") + this->input_reader_->filename()); + } + + private: + std::string filename_; + Layout* layout_; + Incremental_binary* ibase_; + unsigned int input_file_index_; + const Incremental_binary::Input_reader* input_reader_; + Task_token* this_blocker_; + Task_token* next_blocker_; +}; + +// This Task is responsible for processing an archive library that has +// not changed since the last incremental link. + +class Check_library : public Task +{ + public: + Check_library(Symbol_table* /*symtab*/, Layout* layout, + Incremental_binary* ibase, + unsigned int input_file_index, + const Incremental_binary::Input_reader* input_reader, + Task_token* this_blocker, Task_token* next_blocker) + : layout_(layout), ibase_(ibase), + input_file_index_(input_file_index), input_reader_(input_reader), + this_blocker_(this_blocker), next_blocker_(next_blocker) + { } + + ~Check_library(); + + // The standard Task methods. + + Task_token* + is_runnable(); + + void + locks(Task_locker*); + + void + run(Workqueue*); + + std::string + get_name() const + { + return (std::string("Check_library ") + this->input_reader_->filename()); + } + + private: + Layout* layout_; + Incremental_binary* ibase_; + unsigned int input_file_index_; + const Incremental_binary::Input_reader* input_reader_; + Task_token* this_blocker_; + Task_token* next_blocker_; +}; + // This class is used to track the archives in a group. class Input_group @@ -181,6 +323,8 @@ class Input_group : archives_() { } + ~Input_group(); + // Add an archive to the group. void add_archive(Archive* arch)