diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-01-30 14:18:25 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-01-30 14:18:25 +0000 |
| commit | b2fa3a420f1c772ee3a75d20071f09f05320549b (patch) | |
| tree | a6549d08565bd09dc0dcafa319af5cb761e01e25 | |
| parent | 30b21ac37614734ecf8db91c2c7dca8cf164a117 (diff) | |
| download | llvm-b2fa3a420f1c772ee3a75d20071f09f05320549b.tar.gz llvm-b2fa3a420f1c772ee3a75d20071f09f05320549b.tar.bz2 llvm-b2fa3a420f1c772ee3a75d20071f09f05320549b.tar.xz | |
Reenable ARM EHABI on Android.
Broken in r200388.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200466 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMSubtarget.h | 3 | ||||
| -rw-r--r-- | test/CodeGen/ARM/ehabi.ll | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMSubtarget.h b/lib/Target/ARM/ARMSubtarget.h index 200f198d27..ef49e6db07 100644 --- a/lib/Target/ARM/ARMSubtarget.h +++ b/lib/Target/ARM/ARMSubtarget.h @@ -334,7 +334,8 @@ public: 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(); } diff --git a/test/CodeGen/ARM/ehabi.ll b/test/CodeGen/ARM/ehabi.ll index 2d4de44cd1..2cf3ae5e1f 100644 --- a/test/CodeGen/ARM/ehabi.ll +++ b/test/CodeGen/ARM/ehabi.ll @@ -34,6 +34,22 @@ ; RUN: -filetype=asm -o - %s \ ; RUN: | FileCheck %s --check-prefix=CHECK-V7-FP-ELIM +; RUN: llc -mtriple arm-unknown-linux-androideabi \ +; RUN: -disable-fp-elim -filetype=asm -o - %s \ +; RUN: | FileCheck %s --check-prefix=CHECK-FP + +; RUN: llc -mtriple arm-unknown-linux-androideabi \ +; RUN: -filetype=asm -o - %s \ +; RUN: | FileCheck %s --check-prefix=CHECK-FP-ELIM + +; RUN: llc -mtriple armv7-unknown-linux-androideabi \ +; RUN: -disable-fp-elim -filetype=asm -o - %s \ +; RUN: | FileCheck %s --check-prefix=CHECK-V7-FP + +; RUN: llc -mtriple armv7-unknown-linux-androideabi \ +; RUN: -filetype=asm -o - %s \ +; RUN: | FileCheck %s --check-prefix=CHECK-V7-FP-ELIM + ;------------------------------------------------------------------------------- ; Test 1 ;------------------------------------------------------------------------------- |