diff options
| author | Ian Lance Taylor <iant@google.com> | 2007-10-18 17:46:23 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2007-10-18 17:46:23 +0000 |
| commit | 87f9577614a90f155dcdf59864d21dbc3f106469 (patch) | |
| tree | f8c50dbd3e92c4a509c500608e9510e666cc0904 /gold/output.h | |
| parent | ba32f9896b4b1e79f36ae03ac383869127a461e0 (diff) | |
| download | fsf-binutils-gdb-87f9577614a90f155dcdf59864d21dbc3f106469.zip fsf-binutils-gdb-87f9577614a90f155dcdf59864d21dbc3f106469.tar.gz fsf-binutils-gdb-87f9577614a90f155dcdf59864d21dbc3f106469.tar.bz2 | |
Correctly handle alignment in merge sections.
Diffstat (limited to 'gold/output.h')
| -rw-r--r-- | gold/output.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gold/output.h b/gold/output.h index c525a32..a615a71 100644 --- a/gold/output.h +++ b/gold/output.h @@ -1436,12 +1436,14 @@ class Output_section : public Output_data // Return whether this is a merge section which matches the // parameters. bool - is_merge_section(bool is_string, uint64_t entsize) const + is_merge_section(bool is_string, uint64_t entsize, + uint64_t addralign) const { return (this->shndx_ == (is_string ? MERGE_STRING_SECTION_CODE : MERGE_DATA_SECTION_CODE) - && this->u1_.entsize == entsize); + && this->u1_.entsize == entsize + && this->addralign() == addralign); } // Set the output section. |