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/merge.cc | |
| parent | ba32f9896b4b1e79f36ae03ac383869127a461e0 (diff) | |
| download | gdb-87f9577614a90f155dcdf59864d21dbc3f106469.zip gdb-87f9577614a90f155dcdf59864d21dbc3f106469.tar.gz gdb-87f9577614a90f155dcdf59864d21dbc3f106469.tar.bz2 | |
Correctly handle alignment in merge sections.
Diffstat (limited to 'gold/merge.cc')
| -rw-r--r-- | gold/merge.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gold/merge.cc b/gold/merge.cc index f31b44e..b5c836f 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -23,6 +23,7 @@ #include "gold.h" #include <cstdlib> +#include <algorithm> #include "merge.h" @@ -161,10 +162,11 @@ void Output_merge_data::add_constant(const unsigned char* p) { uint64_t entsize = this->entsize(); - if (this->len_ + entsize > this->alc_) + uint64_t addsize = std::max(entsize, this->addralign()); + if (this->len_ + addsize > this->alc_) { if (this->alc_ == 0) - this->alc_ = 128 * entsize; + this->alc_ = 128 * addsize; else this->alc_ *= 2; this->p_ = static_cast<unsigned char*>(realloc(this->p_, this->alc_)); @@ -173,7 +175,9 @@ Output_merge_data::add_constant(const unsigned char* p) } memcpy(this->p_ + this->len_, p, entsize); - this->len_ += entsize; + if (addsize > entsize) + memset(this->p_ + this->len_ + entsize, 0, addsize - entsize); + this->len_ += addsize; } // Add the input section SHNDX in OBJECT to a merged output section |