Merge pull request #15 from mono/android-eh

Emit .fnstart/.fnend directives on arm ELF platforms in the mono EH w…
mono · Sep 15, 2018 · 117a508 · 117a508
2 parents 81376d1 + 7dd8230
commit 117a508
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/CodeGen/AsmPrinter/MonoException.cpp b/lib/CodeGen/AsmPrinter/MonoException.cpp
@@ -254,6 +254,8 @@ MonoException::~MonoException()
 void
 MonoException::beginFunction(const MachineFunction *MF)
 {
+  if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)
+    static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnStart();
   EHLabels.clear();
 }
 
@@ -414,6 +416,8 @@ MonoException::endFunction(const MachineFunction *MF)
   Frames.push_back(info);
   EHLabels.clear();
 
+  if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)
+    static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnEnd();
 }
 
 /// EmitMonoLSDA - Mono's version of EmitExceptionTable