Different attempt to default to hard-float on arm (#803433)

This commit is contained in:
Adam Jackson 2014-06-11 14:58:20 -04:00
parent 0a9388755b
commit 440caf8ff8
2 changed files with 21 additions and 1 deletions

View File

@ -36,7 +36,7 @@
Name: llvm Name: llvm
Version: 3.4 Version: 3.4
Release: 10%{?dist} Release: 11%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
Group: Development/Languages Group: Development/Languages
@ -69,6 +69,9 @@ Patch20: clang-3.4-arm-hard-float.patch
# temporary measure to get ppc64le building, if perhaps not working # temporary measure to get ppc64le building, if perhaps not working
Patch21: 0001-PPC64LE-ELFv2-ABI-updates-for-the-.opd-section.patch Patch21: 0001-PPC64LE-ELFv2-ABI-updates-for-the-.opd-section.patch
# http://llvm.org/bugs/attachment.cgi?id=12586
Patch22: pr12586.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: flex BuildRequires: flex
@ -310,6 +313,7 @@ mv lldb-%{version} tools/lldb
%patch20 -p1 %patch20 -p1
%endif %endif
%patch21 -p1 %patch21 -p1
%patch22 -p1
# fix library paths # fix library paths
sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure
@ -675,6 +679,9 @@ exit 0
%endif %endif
%changelog %changelog
* Wed Jun 11 2014 Adam Jackson <ajax@redhat.com> 3.4-11
- Different attempt to default to hard-float on arm (#803433)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4-10 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

13
pr12586.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
index 29713ed..0d23694 100644
--- a/tools/clang/lib/Driver/Tools.cpp
+++ b/tools/clang/lib/Driver/Tools.cpp
@@ -747,7 +747,7 @@ static StringRef getARMFloatABI(const Driver &D,
FloatABI = "hard";
break;
case llvm::Triple::GNUEABI:
- FloatABI = "softfp";
+ FloatABI = Triple.getVendorName() == "hardfloat" ? "hard" : "softfp";
break;
case llvm::Triple::EABI:
// EABI is always AAPCS, and if it was not marked 'hard', it's softfp