diff options
| author | Ian Lance Taylor <iant@google.com> | 2008-02-26 22:48:08 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2008-02-26 22:48:08 +0000 |
| commit | ec9988eea7eaed4a5338c68e64069a2a75f6d375 (patch) | |
| tree | f73043153c30d4636ecd909402809d732346cafe /gold/dynobj.cc | |
| parent | 50fe4f37d391fff65eb53e275b18452b54fdc1af (diff) | |
| download | binutils-redhat-ec9988eea7eaed4a5338c68e64069a2a75f6d375.tar.gz | |
From Craig Silverstein: rework handling of Script_options.
Diffstat (limited to 'gold/dynobj.cc')
| -rw-r--r-- | gold/dynobj.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gold/dynobj.cc b/gold/dynobj.cc index 780e0c902b..a33707b8c8 100644 --- a/gold/dynobj.cc +++ b/gold/dynobj.cc @@ -27,7 +27,6 @@ #include "elfcpp.h" #include "parameters.h" -#include "options.h" #include "script.h" #include "symtab.h" #include "dynobj.h" @@ -1229,9 +1228,10 @@ Verneed::write(const Stringpool* dynpool, bool is_last, // Versions methods. -Versions::Versions(const General_options& options, Stringpool* dynpool) +Versions::Versions(const Version_script_info& version_script, + Stringpool* dynpool) : defs_(), needs_(), version_table_(), - is_finalized_(false), version_script_(options.version_script()) + is_finalized_(false), version_script_(version_script) { // We always need a base version, so define that first. Nothing // explicitly declares itself as part of base, so it doesn't need to @@ -1260,7 +1260,7 @@ Versions::Versions(const General_options& options, Stringpool* dynpool) true, &version_key); Verdef* const vd = new Verdef( version, - options.version_script().get_dependencies(version), + this->version_script_.get_dependencies(version), false, false, false); this->defs_.push_back(vd); Key key(version_key, 0); |