diff options
author | Ian Lance Taylor <ian@airs.com> | 2009-12-30 22:35:49 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 2009-12-30 22:35:49 +0000 |
commit | 6affe781e430bbf2075faf6539fb020564b3a38f (patch) | |
tree | 692719941fd882684f44cd343d474bd89fec941e /gold/options.cc | |
parent | d35130122459b29ac7f41123d224aa61d00625f6 (diff) | |
download | fsf-binutils-gdb-6affe781e430bbf2075faf6539fb020564b3a38f.zip fsf-binutils-gdb-6affe781e430bbf2075faf6539fb020564b3a38f.tar.gz fsf-binutils-gdb-6affe781e430bbf2075faf6539fb020564b3a38f.tar.bz2 |
PR 10861
* script.h (class Version_script_info): Define Language enum.
Update declarations. Define Glob, Exact, and Lookup types. Add
new fields globals_, locals_, and is_finalized_.
* script.cc: Various formatting fixes.
(class Parser_closure): Change language_stack_ from a vector of
std::string to one of Version_script_info::Language. Adjust all
uses accordingly.
(class Lazy_demangler): Remove.
(struct Version_expression): Change language from std::string to
Version_script_info::Language.
(Version_script_info::Version_script_info): New function.
(Version_script_info::~Version_script_info): Don't call clear.
(Version_script_info::finalize): New function.
(Version_script_info::build_lookup_tables): New function.
(Version_script_info::build_expression_list_lookup): New
function.
(Version_script_info::get_symbol_version_helper): Rewrite to use
lookup tables.
(Version_script_info::print_expression_list): Adjust to use
Version_script_info::Language.
(script_push_lex_into_version_mode): Check that the version script
has not been finalized.
(version_script_push_lang): Change language string to
Version_script_info::Language.
* options.cc (Command_line::version_script): New function.
* options.h (class General_options): Add finalize_dynamic_list
function. Change version_script from declaration to definition.
* testsuite/ver_test_4.script: Remove duplicate def of t2_2.
* testsuite/version_script.map: Remove duplicate def of foo.
* testsuite/Makefile.am (ver_matching_def.so): Depend upon
version_script.map.
* testsuite/Makefile.in: Rebuild.
Diffstat (limited to 'gold/options.cc')
-rw-r--r-- | gold/options.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gold/options.cc b/gold/options.cc index 73da963..671f3d5 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -1209,4 +1209,15 @@ Command_line::process(int argc, const char** argv) this->options_.finalize(); } +// Finalize the version script options and return them. + +const Version_script_info& +Command_line::version_script() +{ + this->options_.finalize_dynamic_list(); + Version_script_info* vsi = this->script_options_.version_script_info(); + vsi->finalize(); + return *vsi; +} + } // End namespace gold. |