[llvm] r337424 - Revert "ARM: switch armv7em triple to hard-float defaults and libcalls."

[Tim Northover via llvm-commits]

Author: tnorthover
Date: Wed Jul 18 14:32:49 2018
New Revision: 337424

URL: http://llvm.org/viewvc/llvm-project?rev=337424&view=rev
Log:
Revert "ARM: switch armv7em triple to hard-float defaults and libcalls."

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

Removed:
    llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll
Modified:
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
    llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.h?rev=337424&r1=337423&r2=337424&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.h Wed Jul 18 14:32:49 2018
@@ -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;
   }

Modified: llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll?rev=337424&r1=337423&r2=337424&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll Wed Jul 18 14:32:49 2018
@@ -20,5 +20,5 @@ define double @double_op(double %lhs, do
 ; CHECK-M3: bl ___adddf3
 
 ; CHECK-M4-LABEL: double_op:
-; CHECK-M4: {{(bl|blx|b.w)}} ___adddf3
+; CHECK-M4: {{(blx|b.w)}} ___adddf3
 }

Removed: llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll?rev=337423&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll (removed)
@@ -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)