From 0b371c427398949754fe055bad44bd4458de5e9c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 2 May 2016 14:46:39 -0400
Subject: [PATCH] clang: Some improvements

- Link to libgnustl_shared.so by default for C++.
- Setup 'cc' and 'c++' as symlinks to clang.
- Use hard-float ABI om arm by default.
---
 packages/clang/build.sh                                 |  5 +++--
 .../clang/tools-clang-lib-Driver-ToolChain.cpp.patch    | 12 ++++++++++++
 packages/clang/tools-clang-lib-Driver-Tools.cpp.patch   | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 packages/clang/tools-clang-lib-Driver-ToolChain.cpp.patch
 create mode 100644 packages/clang/tools-clang-lib-Driver-Tools.cpp.patch

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index d4dd316a..e7fe3d2e 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
 _PKG_MAJOR_VERSION=3.8
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"
@@ -69,5 +69,6 @@ termux_step_configure () {
 }
 
 termux_step_post_make_install () {
-        (cd $TERMUX_PREFIX/bin && rm -f clang clang++ && ln -s clang-${_PKG_MAJOR_VERSION} clang && ln -s clang-${_PKG_MAJOR_VERSION} clang++)
+        (cd $TERMUX_PREFIX/bin && ln -f -s clang-${_PKG_MAJOR_VERSION} clang && ln -f -s clang-${_PKG_MAJOR_VERSION} clang++)
+        (cd $TERMUX_PREFIX/bin && ln -f -s clang-${_PKG_MAJOR_VERSION} cc && ln -f -s clang-${_PKG_MAJOR_VERSION} c++)
 }
diff --git a/packages/clang/tools-clang-lib-Driver-ToolChain.cpp.patch b/packages/clang/tools-clang-lib-Driver-ToolChain.cpp.patch
new file mode 100644
index 00000000..da39a4f2
--- /dev/null
+++ b/packages/clang/tools-clang-lib-Driver-ToolChain.cpp.patch
@@ -0,0 +1,12 @@
+diff -u -r ../llvm-3.8.0.src/tools/clang/lib/Driver/ToolChain.cpp ./tools/clang/lib/Driver/ToolChain.cpp
+--- ../llvm-3.8.0.src/tools/clang/lib/Driver/ToolChain.cpp	2015-11-25 20:02:07.000000000 -0500
++++ ./tools/clang/lib/Driver/ToolChain.cpp	2016-05-02 08:50:35.526226962 -0400
+@@ -611,7 +611,7 @@
+     break;
+ 
+   case ToolChain::CST_Libstdcxx:
+-    CmdArgs.push_back("-lstdc++");
++    CmdArgs.push_back("-lgnustl_shared");
+     break;
+   }
+ }
diff --git a/packages/clang/tools-clang-lib-Driver-Tools.cpp.patch b/packages/clang/tools-clang-lib-Driver-Tools.cpp.patch
new file mode 100644
index 00000000..bc839244
--- /dev/null
+++ b/packages/clang/tools-clang-lib-Driver-Tools.cpp.patch
@@ -0,0 +1,17 @@
+diff -u -r ../llvm-3.8.0.src/tools/clang/lib/Driver/Tools.cpp ./tools/clang/lib/Driver/Tools.cpp
+--- ../llvm-3.8.0.src/tools/clang/lib/Driver/Tools.cpp	2016-02-12 17:51:41.000000000 -0500
++++ ./tools/clang/lib/Driver/Tools.cpp	2016-05-01 23:01:30.148998957 -0400
+@@ -733,11 +733,11 @@
+         ABI = FloatABI::SoftFP;
+         break;
+       case llvm::Triple::Android:
+-        ABI = (SubArch == 7) ? FloatABI::SoftFP : FloatABI::Soft;
++        ABI = FloatABI::Hard;
+         break;
+       default:
+         // Assume "soft", but warn the user we are guessing.
+-        ABI = FloatABI::Soft;
++        ABI = FloatABI::Hard;
+         if (Triple.getOS() != llvm::Triple::UnknownOS ||
+             !Triple.isOSBinFormatMachO())
+           D.Diag(diag::warn_drv_assuming_mfloat_abi_is) << "soft";
-- 
2.11.0