From f7eb2f0fcb787749313ef23cff7e62ced663c9ee Mon Sep 17 00:00:00 2001
From: Tim Northover <tnorthover@apple.com>
Date: Wed, 18 Jul 2018 21:32:49 +0000
Subject: [PATCH] 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
---
 lib/Target/ARM/ARMTargetMachine.h        |  1 -
 test/CodeGen/ARM/darwin-eabi.ll          |  2 +-
 test/CodeGen/ARM/macho-embedded-float.ll | 36 --------------------------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 test/CodeGen/ARM/macho-embedded-float.ll

diff --git a/lib/Target/ARM/ARMTargetMachine.h b/lib/Target/ARM/ARMTargetMachine.h
index 7685a689158..811fd5bb339 100644
--- 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 5329f3898ea..5301c0b38a7 100644
--- 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
index abe9d5e7ec9..00000000000
--- 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)
-- 
2.11.0