diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-03-08 22:03:42 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-03-08 22:03:42 +0000 |
| commit | b2b4acd757194b4b75e571ec7225811f94e753f3 (patch) | |
| tree | c252cfeb9a50450f31e24527e118d92f62f6c693 | |
| parent | 77bf295dbb0b049fdec853ced0763084c43b2438 (diff) | |
MC/Macho-O: Align the zerofill section itself to the maximum alignment.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97991 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/MCAssembler.cpp | 10 | ||||
| -rw-r--r-- | test/MC/MachO/zerofill-4.s | 2 | ||||
| -rw-r--r-- | test/MC/MachO/zerofill-sect-align.s | 15 |
3 files changed, 26 insertions, 1 deletions
diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp index 1ec1d815de..4b78dc034f 100644 --- a/lib/MC/MCAssembler.cpp +++ b/lib/MC/MCAssembler.cpp @@ -1279,9 +1279,19 @@ void MCAssembler::Finish() { if (!isVirtualSection(SD.getSection())) continue; + // Align this section if necessary by adding padding bytes to the previous + // section. + if (uint64_t Pad = OffsetToAlignment(Address, it->getAlignment())) { + assert(Prev && "Missing prev section!"); + Prev->setFileSize(Prev->getFileSize() + Pad); + Address += Pad; + } + SD.setAddress(Address); LayoutSection(SD); Address += SD.getSize(); + + Prev = &SD; } DEBUG_WITH_TYPE("mc-dump", { diff --git a/test/MC/MachO/zerofill-4.s b/test/MC/MachO/zerofill-4.s index 3513be4437..d9c987c9b6 100644 --- a/test/MC/MachO/zerofill-4.s +++ b/test/MC/MachO/zerofill-4.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump | FileCheck %s .zerofill __DATA,__bss,_fill0,1,0 .zerofill __DATA,__bss,_a,4,2 diff --git a/test/MC/MachO/zerofill-sect-align.s b/test/MC/MachO/zerofill-sect-align.s new file mode 100644 index 0000000000..5d7730f439 --- /dev/null +++ b/test/MC/MachO/zerofill-sect-align.s @@ -0,0 +1,15 @@ +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump | FileCheck %s +// +// Check that the section itself is aligned. + + .byte 0 + +.zerofill __DATA,__bss,_a,1,0 +.zerofill __DATA,__bss,_b,4,4 + +// CHECK: # Symbol 0 +// CHECK: ('n_value', 16) +// CHECK: ('_string', '_a') +// CHECK: # Symbol 1 +// CHECK: ('n_value', 32) +// CHECK: ('_string', '_b') |