[llvm] r208715 - Check explicitly for EHABI and just use the default settings.

[Joerg Sonnenberger]

Author: joerg
Date: Tue May 13 12:58:13 2014
New Revision: 208715

URL: http://llvm.org/viewvc/llvm-project?rev=208715&view=rev
Log:
Check explicitly for EHABI and just use the default settings.
Code depends on the assembler and linker to fix things up...

Modified:
    llvm/trunk/lib/MC/MCObjectFileInfo.cpp

Modified: llvm/trunk/lib/MC/MCObjectFileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=208715&r1=208714&r2=208715&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCObjectFileInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCObjectFileInfo.cpp Tue May 13 12:58:13 2014
@@ -10,6 +10,7 @@
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Triple.h"
+#include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCSectionCOFF.h"
@@ -264,6 +265,9 @@ void MCObjectFileInfo::InitELFMCObjectFi
   case Triple::armeb:
   case Triple::thumb:
   case Triple::thumbeb:
+    if (Ctx->getAsmInfo()->getExceptionHandlingType() == ExceptionHandling::ARM)
+      break;
+    // Fallthrough if not using EHABI
   case Triple::x86:
     PersonalityEncoding = (RelocM == Reloc::PIC_)
      ? dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4