"Fix" FDE alignment to match what gas does.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122006 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp
index c1de31b..24ddc82 100644
--- a/lib/MC/MCDwarf.cpp
+++ b/lib/MC/MCDwarf.cpp
@@ -569,11 +569,9 @@
return *sectionStart;
}
-static void EmitFDE(MCStreamer &streamer,
- const MCSymbol &cieStart,
- const MCDwarfFrameInfo &frame) {
- MCContext &context = streamer.getContext();
- const TargetAsmInfo &asmInfo = context.getTargetAsmInfo();
+static MCSymbol *EmitFDE(MCStreamer &streamer,
+ const MCSymbol &cieStart,
+ const MCDwarfFrameInfo &frame) {
MCSymbol *fdeStart = streamer.getContext().CreateTempSymbol();
MCSymbol *fdeEnd = streamer.getContext().CreateTempSymbol();
@@ -602,12 +600,22 @@
// Call Frame Instructions
// Padding
- streamer.EmitValueToAlignment(asmInfo.getPointerSize());
- streamer.EmitLabel(fdeEnd);
+ streamer.EmitValueToAlignment(4);
+
+ return fdeEnd;
}
void MCDwarfFrameEmitter::Emit(MCStreamer &streamer) {
+ const MCContext &context = streamer.getContext();
+ const TargetAsmInfo &asmInfo = context.getTargetAsmInfo();
const MCSymbol &cieStart = EmitCIE(streamer);
- for (unsigned i = 0, n = streamer.getNumFrameInfos(); i < n; ++i)
- EmitFDE(streamer, cieStart, streamer.getFrameInfo(i));
+ MCSymbol *fdeEnd = NULL;
+ for (unsigned i = 0, n = streamer.getNumFrameInfos(); i < n; ++i) {
+ fdeEnd = EmitFDE(streamer, cieStart, streamer.getFrameInfo(i));
+ if (i != n - 1)
+ streamer.EmitLabel(fdeEnd);
+ }
+ streamer.EmitValueToAlignment(asmInfo.getPointerSize());
+ if (fdeEnd)
+ streamer.EmitLabel(fdeEnd);
}