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 | 02bc78b9cdc106f8265fe9ee4d9c7f9cdde74127 (patch) | |
| tree | a50789561f238f6e41e6643346937b0553ceed6a | |
| parent | d534fc3d0c4caab5ab638c19e76fa748ae99ec38 (diff) | |
| download | bcm5719-llvm-02bc78b9cdc106f8265fe9ee4d9c7f9cdde74127.tar.gz bcm5719-llvm-02bc78b9cdc106f8265fe9ee4d9c7f9cdde74127.zip | |
Reenable ARM EHABI on Android.
Broken in r200388.
llvm-svn: 200466
| -rw-r--r-- | llvm/lib/Target/ARM/ARMSubtarget.h | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/ehabi.ll | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.h b/llvm/lib/Target/ARM/ARMSubtarget.h index 200f198d27f..ef49e6db07f 100644 --- a/llvm/lib/Target/ARM/ARMSubtarget.h +++ b/llvm/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/llvm/test/CodeGen/ARM/ehabi.ll b/llvm/test/CodeGen/ARM/ehabi.ll index 2d4de44cd1b..2cf3ae5e1f3 100644 --- a/llvm/test/CodeGen/ARM/ehabi.ll +++ b/llvm/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 ;------------------------------------------------------------------------------- |
