3 files changed, 64 insertions, 0 deletions
diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h
index 1a01d6baa9e..aceba761200 100644
--- a/llvm/include/llvm/MC/MCStreamer.h
+++ b/llvm/include/llvm/MC/MCStreamer.h
@@ -459,6 +459,10 @@ namespace llvm {
 
     virtual void EmitWin64EHStartProc(MCSymbol *Symbol, MCSymbol *EHandler = 0);
     virtual void EmitWin64EHEndProc();
+    virtual void EmitWin64EHStartChained();
+    virtual void EmitWin64EHEndChained();
+    virtual void EmitWin64EHUnwindOnly();
+    virtual void EmitWin64EHLsda(const MCSymbol *Sym, int64_t Size);
     virtual void EmitWin64EHPushReg(int64_t Register);
     virtual void EmitWin64EHSetFrame(int64_t Register, int64_t Offset);
     virtual void EmitWin64EHAllocStack(int64_t Size);
diff --git a/llvm/lib/MC/MCAsmStreamer.cpp b/llvm/lib/MC/MCAsmStreamer.cpp
index 41a821dbb9d..f62111bcf86 100644
--- a/llvm/lib/MC/MCAsmStreamer.cpp
+++ b/llvm/lib/MC/MCAsmStreamer.cpp
@@ -210,6 +210,10 @@ public:
 
   virtual void EmitWin64EHStartProc(MCSymbol *Symbol, MCSymbol *EHandler = 0);
   virtual void EmitWin64EHEndProc();
+  virtual void EmitWin64EHStartChained();
+  virtual void EmitWin64EHEndChained();
+  virtual void EmitWin64EHUnwindOnly();
+  virtual void EmitWin64EHLsda(cosnt MCSymbol *Sym, int64_t Size);
   virtual void EmitWin64EHPushReg(int64_t Register);
   virtual void EmitWin64EHSetFrame(int64_t Register, int64_t Offset);
   virtual void EmitWin64EHAllocStack(int64_t Size);
@@ -942,6 +946,38 @@ void MCAsmStreamer::EmitWin64EHEndProc()
   EmitEOL();
 }
 
+void MCAsmStreamer::EmitWin64EHStartChained()
+{
+  //MCStreamer::EmitWin64EHStartChained();
+
+  OS << "\t.w64_startchained";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHEndChained()
+{
+  //MCStreamer::EmitWin64EHEndChained();
+
+  OS << "\t.w64_endchained";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHUnwindOnly()
+{
+  //MCStreamer::EmitWin64EHUnwindOnly();
+
+  OS << "\t.w64_unwind_only";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHLsda(cosnt MCSymbol *Sym, int64_t Size)
+{
+  //MCStreamer::EmitWin64EHLsda(Sym, Size);
+
+  OS << "\t.w64_lsda " << *Sym << ", " << Size;
+  EmitEOL();
+}
+
 void MCAsmStreamer::EmitWin64EHPushReg(int64_t Register)
 {
   //MCStreamer::EmitWin64EHPushReg(Register);
diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp
index 5924d02802a..bf63f8faee4 100644
--- a/llvm/lib/MC/MCStreamer.cpp
+++ b/llvm/lib/MC/MCStreamer.cpp
@@ -322,6 +322,30 @@ void MCStreamer::EmitWin64EHEndProc()
   abort();
 }
 
+void MCStreamer::EmitWin64EHStartChained()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHEndChained()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHUnwindOnly()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHLsda(const MCSymbol *Sym, int64_t Size)
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
 void MCStreamer::EmitWin64EHPushReg(int64_t Register)
 {
   errs() << "Not implemented yet\n";