3 files changed, 24 insertions, 1 deletions
diff --git a/lib/MC/MCStreamer.cpp b/lib/MC/MCStreamer.cpp
index 164325e8f4..f268f9e375 100644
--- a/lib/MC/MCStreamer.cpp
+++ b/lib/MC/MCStreamer.cpp
@@ -506,3 +506,10 @@ void MCStreamer::EmitFrames(bool usingCFI) {
   if (EmitDebugFrame)
     MCDwarfFrameEmitter::Emit(*this, usingCFI, false);
 }
+
+void MCStreamer::EmitW64Tables() {
+  if (!getNumW64UnwindInfos())
+    return;
+
+  MCWin64EHUnwindEmitter::Emit(*this);
+}
diff --git a/lib/MC/MCWin64EH.cpp b/lib/MC/MCWin64EH.cpp
index 9884f66e5f..fc394504bf 100644
--- a/lib/MC/MCWin64EH.cpp
+++ b/lib/MC/MCWin64EH.cpp
@@ -110,7 +110,7 @@ static void EmitUnwindCode(MCStreamer &streamer, MCWin64EHInstruction &inst) {
 }
 
 static void EmitRuntimeFunction(MCStreamer &streamer,
-                                MCWin64EHUnwindInfo *info) {
+                                const MCWin64EHUnwindInfo *info) {
   MCContext &context = streamer.getContext();
 
   streamer.EmitValue(MCSymbolRefExpr::Create(info->Begin, context), 4);
@@ -185,5 +185,20 @@ void MCWin64EHUnwindEmitter::EmitUnwindInfo(MCStreamer &streamer,
   llvm::EmitUnwindInfo(streamer, info);
 }
 
+void MCWin64EHUnwindEmitter::Emit(MCStreamer &streamer) {
+  MCContext &context = streamer.getContext();
+  // Emit the unwind info structs first.
+  const TargetAsmInfo &asmInfo = context.getTargetAsmInfo();
+  const MCSection *xdataSect = asmInfo.getWin64EHTableSection();
+  streamer.SwitchSection(xdataSect);
+  for (unsigned i = 0; i < streamer.getNumW64UnwindInfos(); ++i)
+    llvm::EmitUnwindInfo(streamer, &streamer.getW64UnwindInfo(i));
+  // Now emit RUNTIME_FUNCTION entries.
+  const MCSection *pdataSect = asmInfo.getWin64EHFuncTableSection();
+  streamer.SwitchSection(pdataSect);
+  for (unsigned i = 0; i < streamer.getNumW64UnwindInfos(); ++i)
+    EmitRuntimeFunction(streamer, &streamer.getW64UnwindInfo(i));
+}
+
 } // End of namespace llvm
 
diff --git a/lib/MC/WinCOFFStreamer.cpp b/lib/MC/WinCOFFStreamer.cpp
index 8b0cfcbd62..6c36c1231c 100644
--- a/lib/MC/WinCOFFStreamer.cpp
+++ b/lib/MC/WinCOFFStreamer.cpp
@@ -388,6 +388,7 @@ void WinCOFFStreamer::EmitWin64EHHandlerData() {
 }
 
 void WinCOFFStreamer::Finish() {
+  EmitW64Tables();
   MCObjectStreamer::Finish();
 }