From da142d10d9b71ef6d278e6f45fd3692e7c66948d 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.

llvm-svn: 337424
---
 llvm/lib/Target/ARM/ARMTargetMachine.h        |  1 -
 llvm/test/CodeGen/ARM/darwin-eabi.ll          |  2 +-
 llvm/test/CodeGen/ARM/macho-embedded-float.ll | 36 ---------------------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 llvm/test/CodeGen/ARM/macho-embedded-float.ll

diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.h b/llvm/lib/Target/ARM/ARMTargetMachine.h
index 7685a68..811fd5b 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.h
+++ b/llvm/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/llvm/test/CodeGen/ARM/darwin-eabi.ll b/llvm/test/CodeGen/ARM/darwin-eabi.ll
index 5329f389..5301c0b 100644
--- a/llvm/test/CodeGen/ARM/darwin-eabi.ll
+++ b/llvm/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/llvm/test/CodeGen/ARM/macho-embedded-float.ll b/llvm/test/CodeGen/ARM/macho-embedded-float.ll
deleted file mode 100644
index abe9d5e..0000000
--- a/llvm/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.7.4