1 files changed, 12 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMTargetObjectFile.cpp b/lib/Target/ARM/ARMTargetObjectFile.cpp
index dfdf6ab356..c954550bb8 100644
--- a/lib/Target/ARM/ARMTargetObjectFile.cpp
+++ b/lib/Target/ARM/ARMTargetObjectFile.cpp
@@ -10,6 +10,8 @@
 #include "ARMTargetObjectFile.h"
 #include "ARMSubtarget.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/Triple.h" // @LOCALMOD
+#include "llvm/CodeGen/MachineModuleInfo.h" // @LOCALMOD
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCSectionELF.h"
@@ -30,7 +32,9 @@ void ARMElfTargetObjectFile::Initialize(MCContext &Ctx,
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
   InitializeELF(isAAPCS_ABI);
 
-  if (isAAPCS_ABI) {
+  // @LOCALMOD-BEGIN
+  if (isAAPCS_ABI && !TM.getSubtarget<ARMSubtarget>().isTargetNaCl()) {
+  // @LOCALMOD-END
     LSDASection = NULL;
   }
 
@@ -46,7 +50,13 @@ getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang,
                         MachineModuleInfo *MMI, unsigned Encoding,
                         MCStreamer &Streamer) const {
   assert(Encoding == DW_EH_PE_absptr && "Can handle absptr encoding only");
-
+  // @LOCALMOD-BEGIN
+  // FIXME: There has got to be a better way to get this info.
+  Triple T(MMI->getModule()->getTargetTriple());
+  if (T.isOSNaCl())
+    return TargetLoweringObjectFileELF::getTTypeGlobalReference(GV, Mang,
+                                        MMI, Encoding, Streamer);
+  // @LOCALMOD-END
   return MCSymbolRefExpr::Create(Mang->getSymbol(GV),
                                  MCSymbolRefExpr::VK_ARM_TARGET2,
                                  getContext());