diff options
| author | Doug Kwan <dougkwan@google.com> | 2010-03-19 19:11:21 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2010-03-19 19:11:21 +0000 |
| commit | d099120c64430117a80fc95c0bff2da9ff5d8657 (patch) | |
| tree | 459701f27b0243cd692c50d63fd90bd934a3886c /gold/stringpool.h | |
| parent | 20781792668b79372f059ecb51fa5d61a1a43f84 (diff) | |
| download | binutils-gdb-d099120c64430117a80fc95c0bff2da9ff5d8657.tar.gz | |
2010-03-19 Doug Kwan <dougkwan@google.com>
* arm.cc (Stub_table::Stub_table): Initialize new data members
Stub_table::reloc_stubs_size_ and Stub_table::reloc_stubs_addralign_.
(Stub_table::add_reloc_stub): Assign stub offset and update
Stub_table::reloc_stubs_size_ and Stub_table::reloc_stubs_addralign_.
(Stub_table::reloc_stubs_size_, Stub_table::reloc_stubs_addralign_):
New data members.
(Stub_table::update_data_size_and_addralign): Use
Stub_table::reloc_stubs_size_ and Stub_table::reloc_stubs_addralign_
instead of going over all reloc stubs.
(Stub_table::finalize_stubs): Do not assign reloc stub offsets.
* stringpool.cc (Stringpool_template::Stringpool_template): Initialize
Stringpool_template::offset_ to size of Stringpool_char.
(Stringpool_template::new_key_offset): Remove code to initialize
Stringpool_template::offset_.
* stringpool.h (Stringpool_template::set_no_zero_null): Set
Stringpool_template::offset_ to zero.
Diffstat (limited to 'gold/stringpool.h')
| -rw-r--r-- | gold/stringpool.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gold/stringpool.h b/gold/stringpool.h index df3826d9eb0..f353c9d9a2f 100644 --- a/gold/stringpool.h +++ b/gold/stringpool.h @@ -178,8 +178,10 @@ class Stringpool_template void set_no_zero_null() { - gold_assert(this->string_set_.empty()); + gold_assert(this->string_set_.empty() + && this->offset_ == sizeof(Stringpool_char)); this->zero_null_ = false; + this->offset_ = 0; } // Indicate that this string pool should be optimized, even if not |