From 4484a395493d995d47866182f314d02a3a5923c3 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 2 Jun 2014 11:27:54 -0400
Subject: [PATCH] Attempt to default to hard-float on arm (#803433)

---
 clang-3.4-arm-hard-float.patch | 16 ++++++++++++++++
 llvm.spec                      | 11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 clang-3.4-arm-hard-float.patch

diff --git a/clang-3.4-arm-hard-float.patch b/clang-3.4-arm-hard-float.patch
new file mode 100644
index 0000000..0bb7782
--- /dev/null
+++ b/clang-3.4-arm-hard-float.patch
@@ -0,0 +1,16 @@
+diff -up llvm-3.4.1.src/tools/clang/lib/Driver/Tools.cpp.jx llvm-3.4.1.src/tools/clang/lib/Driver/Tools.cpp
+--- llvm-3.4.1.src/tools/clang/lib/Driver/Tools.cpp.jx	2013-12-08 21:59:27.000000000 -0500
++++ llvm-3.4.1.src/tools/clang/lib/Driver/Tools.cpp	2014-06-02 11:24:07.628292753 -0400
+@@ -763,9 +763,9 @@ static StringRef getARMFloatABI(const Dr
+         break;
+       }
+       default:
+-        // Assume "soft", but warn the user we are guessing.
+-        FloatABI = "soft";
+-        D.Diag(diag::warn_drv_assuming_mfloat_abi_is) << "soft";
++        // Assume "hard", but warn the user we are guessing.
++        FloatABI = "hard";
++        D.Diag(diag::warn_drv_assuming_mfloat_abi_is) << "hard";
+         break;
+       }
+     }
diff --git a/llvm.spec b/llvm.spec
index a657842..ec06e78 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -36,7 +36,7 @@
 
 Name:           llvm
 Version:        3.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -63,6 +63,9 @@ Patch4:		0004-Merging-r208908.patch
 Patch11:         0001-data-install-preserve-timestamps.patch
 Patch12:         0002-linker-flags-speedup-memory.patch
 
+# sledgehammer to default to hard-float on arm
+Patch20:	clang-3.4-arm-hard-float.patch
+
 BuildRequires:  bison
 BuildRequires:  chrpath
 BuildRequires:  flex
@@ -300,6 +303,9 @@ mv lldb-%{version} tools/lldb
 %patch4 -p1
 %patch11 -p1
 %patch12 -p1
+%if %{with clang}
+%patch20 -p1
+%endif
 
 # fix library paths
 sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure
@@ -665,6 +671,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 02 2014 Adam Jackson <ajax@redhat.com> 3.4-8
+- Attempt to default to hard-float on arm (#803433)
+
 * Thu May 29 2014 Adam Jackson <ajax@redhat.com> 3.4-7
 - Update to llvm 3.4.1 plus a few things from svn
 - Drop radeonsi patch, merged in 3.4.1