diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp | 36 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/Mips/delay-slot.ll | 2 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/section-size.s | 4 |
3 files changed, 27 insertions, 15 deletions
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp index 73b7722aa08..58c1f0ee4ee 100644 --- a/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp +++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp @@ -21,12 +21,19 @@ #include "llvm/MC/MCSectionELF.h" #include "llvm/MC/MCSubtargetInfo.h" #include "llvm/MC/MCSymbolELF.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Support/ELF.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" using namespace llvm; +namespace { +static cl::opt<bool> RoundSectionSizes( + "mips-round-section-sizes", cl::init(false), + cl::desc("Round section sizes up to the section alignment"), cl::Hidden); +} // end anonymous namespace + MipsTargetStreamer::MipsTargetStreamer(MCStreamer &S) : MCTargetStreamer(S), ModuleDirectiveAllowed(true) { GPRInfoSet = FPRInfoSet = FrameInfoSet = false; @@ -729,18 +736,23 @@ void MipsTargetELFStreamer::finish() { DataSection.setAlignment(std::max(16u, DataSection.getAlignment())); BSSSection.setAlignment(std::max(16u, BSSSection.getAlignment())); - // Make sections sizes a multiple of the alignment. - MCStreamer &OS = getStreamer(); - for (MCSection &S : MCA) { - MCSectionELF &Section = static_cast<MCSectionELF &>(S); - - unsigned Alignment = Section.getAlignment(); - if (Alignment) { - OS.SwitchSection(&Section); - if (Section.UseCodeAlign()) - OS.EmitCodeAlignment(Alignment, Alignment); - else - OS.EmitValueToAlignment(Alignment, 0, 1, Alignment); + if (RoundSectionSizes) { + // Make sections sizes a multiple of the alignment. This is useful for + // verifying the output of IAS against the output of other assemblers but + // it's not necessary to produce a correct object and increases section + // size. + MCStreamer &OS = getStreamer(); + for (MCSection &S : MCA) { + MCSectionELF &Section = static_cast<MCSectionELF &>(S); + + unsigned Alignment = Section.getAlignment(); + if (Alignment) { + OS.SwitchSection(&Section); + if (Section.UseCodeAlign()) + OS.EmitCodeAlignment(Alignment, Alignment); + else + OS.EmitValueToAlignment(Alignment, 0, 1, Alignment); + } } } diff --git a/llvm/test/DebugInfo/Mips/delay-slot.ll b/llvm/test/DebugInfo/Mips/delay-slot.ll index ee3efcaa885..d441481f84a 100644 --- a/llvm/test/DebugInfo/Mips/delay-slot.ll +++ b/llvm/test/DebugInfo/Mips/delay-slot.ll @@ -19,7 +19,7 @@ ; CHECK: 0x000000000000002c 3 0 1 0 0 is_stmt ; CHECK: 0x000000000000003c 4 0 1 0 0 is_stmt ; CHECK: 0x0000000000000048 5 0 1 0 0 is_stmt -; CHECK: 0x0000000000000060 5 0 1 0 0 is_stmt end_sequence +; CHECK: 0x0000000000000058 5 0 1 0 0 is_stmt end_sequence target datalayout = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64" diff --git a/llvm/test/MC/Mips/section-size.s b/llvm/test/MC/Mips/section-size.s index e8b64324a2e..f6ffa8fe2de 100644 --- a/llvm/test/MC/Mips/section-size.s +++ b/llvm/test/MC/Mips/section-size.s @@ -1,5 +1,5 @@ -# RUN: llvm-mc -triple mips-unknown-linux -filetype=obj %s | \ -# RUN: llvm-readobj -sections | FileCheck %s +# RUN: llvm-mc -triple mips-unknown-linux -filetype=obj \ +# RUN: -mips-round-section-sizes %s | llvm-readobj -sections | FileCheck %s .section ".talign1", "ax" .p2align 4 t1: .byte 1 |
