diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-04-14 23:11:14 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-04-14 23:11:14 +0000 |
| commit | bd94dbcf0ab911034db998bb974cc5471a11f1ff (patch) | |
| tree | ae736af982229eaa72597c11b13cb0f264775e51 | |
| parent | 13e41bcf9c749de405c400091dc6517ae4569342 (diff) | |
| download | bcm5719-llvm-bd94dbcf0ab911034db998bb974cc5471a11f1ff.tar.gz bcm5719-llvm-bd94dbcf0ab911034db998bb974cc5471a11f1ff.zip | |
ELF: Attempt to simplify Segment::AssignVirtualAddress.
This is a retry of r234944.
llvm-svn: 234955
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/SegmentChunks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp b/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp index aff9668f884..93f2ce4c179 100644 --- a/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp +++ b/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp @@ -200,7 +200,7 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t addr) { // Align to a page only if the output is not // OutputMagic::NMAGIC/OutputMagic::OMAGIC startAddr = llvm::RoundUpToAlignment(startAddr, this->_ctx.getPageSize()); - } else if (!isDataPageAlignedForNMagic && needAlign(*si)) { + } else if (needAlign(*si)) { // If the linker outputmagic is set to OutputMagic::NMAGIC, align the // Data to a page boundary. startAddr = llvm::RoundUpToAlignment(startAddr, this->_ctx.getPageSize()); |
