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 | a5dc07065554d074ae0452b388cd9c80b2bc6504 (patch) | |
| tree | ce2d8d5be0590dbf264053db8996e684b2fd26db /gold/layout.cc | |
| parent | 5daa78cc6fc04e0367c11459bb2ae0531c8732ac (diff) | |
| download | gdb-a5dc07065554d074ae0452b388cd9c80b2bc6504.zip gdb-a5dc07065554d074ae0452b388cd9c80b2bc6504.tar.gz gdb-a5dc07065554d074ae0452b388cd9c80b2bc6504.tar.bz2 | |
From Craig Silverstein: rework handling of Script_options.
Diffstat (limited to 'gold/layout.cc')
| -rw-r--r-- | gold/layout.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gold/layout.cc b/gold/layout.cc index 98cafc5..6685156 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -925,7 +925,8 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, Output_section* dynstr; std::vector<Symbol*> dynamic_symbols; unsigned int local_dynamic_count; - Versions versions(this->options_, &this->dynpool_); + Versions versions(*this->script_options()->version_script_info(), + &this->dynpool_); this->create_dynamic_symtab(input_objects, symtab, &dynstr, &local_dynamic_count, &dynamic_symbols, &versions); @@ -980,7 +981,7 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, // Lay out the file header. Output_file_header* file_header; file_header = new Output_file_header(target, symtab, segment_headers, - this->script_options_->entry()); + this->options_.entry()); if (load_seg != NULL) load_seg->add_initial_output_data(file_header); |