commit 02bc78b9cdc106f8265fe9ee4d9c7f9cdde74127
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Jan 30 14:18:25 2014 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Jan 30 14:18:25 2014 +0000
tree a50789561f238f6e41e6643346937b0553ceed6a
parent d534fc3d0c4caab5ab638c19e76fa748ae99ec38

Reenable ARM EHABI on Android.

Broken in r200388.

llvm-svn: 200466

llvm/lib/Target/ARM/ARMSubtarget.h

diff --git a/llvm/lib/Target/ARM/ARMSubtarget.h b/llvm/lib/Target/ARM/ARMSubtarget.h
index 200f198..ef49e6d 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.h
+++ b/llvm/lib/Target/ARM/ARMSubtarget.h
@@ -334,7 +334,8 @@
     return (TargetTriple.getEnvironment() == Triple::EABI ||
             TargetTriple.getEnvironment() == Triple::GNUEABI ||
             TargetTriple.getEnvironment() == Triple::EABIHF ||
-            TargetTriple.getEnvironment() == Triple::GNUEABIHF) &&
+            TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
+            TargetTriple.getEnvironment() == Triple::Android) &&
            !isTargetDarwin();
   }