Revert "ARM: switch armv7em triple to hard-float defaults and libcalls."

This reverts commit r337385 until it can be targeted at MachO only.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@337424 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMTargetMachine.h b/lib/Target/ARM/ARMTargetMachine.h
index 7685a68915856f7c6f1b06c5342785c2a462cb77..811fd5bb339db6477c4a42e95d537ce11fc0fa97 100644 (file)
--- a/lib/Target/ARM/ARMTargetMachine.h
+++ b/lib/Target/ARM/ARMTargetMachine.h
@@ -66,7 +66,6 @@ public:
     return TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
            TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
            TargetTriple.getEnvironment() == Triple::EABIHF ||
-           TargetTriple.getSubArch() == Triple::ARMSubArch_v7em ||
            TargetTriple.isOSWindows() ||
            TargetABI == ARMBaseTargetMachine::ARM_ABI_AAPCS16;
   }

diff --git a/test/CodeGen/ARM/darwin-eabi.ll b/test/CodeGen/ARM/darwin-eabi.ll
index 5329f3898ea3cc3241d2b1d087d1650223fa1a31..5301c0b38a750014385db20e6bc25749576efe18 100644 (file)
--- a/test/CodeGen/ARM/darwin-eabi.ll
+++ b/test/CodeGen/ARM/darwin-eabi.ll
@@ -20,5 +20,5 @@ define double @double_op(double %lhs, double %rhs) {
 ; CHECK-M3: bl ___adddf3
 
 ; CHECK-M4-LABEL: double_op:
-; CHECK-M4: {{(bl|blx|b.w)}} ___adddf3
+; CHECK-M4: {{(blx|b.w)}} ___adddf3
 }

diff --git a/test/CodeGen/ARM/macho-embedded-float.ll b/test/CodeGen/ARM/macho-embedded-float.ll
deleted file mode 100644 (file)
index abe9d5e..0000000
--- a/test/CodeGen/ARM/macho-embedded-float.ll
+++ /dev/null
@@ -1,36 +0,0 @@
-; RUN: llc -mtriple=thumbv7em-none-macho %s -o - -mcpu=cortex-m4 | FileCheck --check-prefix=CHECK-HARD %s
-; RUN: llc -mtriple=thumbv7m-none-macho %s -o - -mcpu=cortex-m4 | FileCheck --check-prefix=CHECK-SOFT %s
-
-define float @test_default_cc(float %a, float %b) {
-; CHECK-HARD-LABEL: test_default_cc:
-; CHECK-HARD-NOT: vmov
-; CHECK-HARD: vadd.f32 s0, s0, s1
-; CHECK-HARD-NOT: vmov
-
-; CHECK-SOFT-LABEL: test_default_cc:
-; CHECK-SOFT-DAG: vmov [[A:s[0-9]+]], r0
-; CHECK-SOFT-DAG: vmov [[B:s[0-9]+]], r1
-; CHECK-SOFT: vadd.f32 [[RES:s[0-9]+]], [[A]], [[B]]
-; CEHCK-SOFT: vmov r0, [[RES]]
-
-  %res = fadd float %a, %b
-  ret float %res
-}
-
-
-define arm_aapcs_vfpcc float @test_libcall(float %in) {
-; CHECK-HARD-LABEL: test_libcall:
-; CHECK-HARD-NOT: vmov
-; CHECK-HARD: b.w _sinf
-
-; CHECK-SOFT-LABEL: test_libcall:
-; CHECK-SOFT: vmov r0, s0
-; CHECK-SOFT: bl _sinf
-; CHECK-SOFT: vmov s0, r0
-
-  %res = call float @llvm.sin.f32(float %in)
-  ret float %res
-}
-
-
-declare float @llvm.sin.f32(float)