From 64fb69a9c85198072468f5e000902b32ac474d6c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 20 Sep 2018 02:22:52 +0200
Subject: [PATCH] llvm: Update from 6.0.1 to 7.0.0

---
 packages/libllvm/build.sh                     | 13 ++++++-------
 packages/libllvm/docs-AMDGPUUsage.rst.patch   | 19 -------------------
 ...docs-Proposals-VectorizationPlan.rst.patch | 14 --------------
 packages/lldb/build.sh                        |  4 ++--
 4 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 packages/libllvm/docs-AMDGPUUsage.rst.patch
 delete mode 100644 packages/libllvm/docs-Proposals-VectorizationPlan.rst.patch

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index 71d94a730..217fd02c7 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
-_PKG_MAJOR_VERSION=6.0
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
-TERMUX_PKG_SHA256=(b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2
-		   7c243f1485bddfdfedada3cd402ff4792ea82362ff91fbdac2dae67c6026b667
-		   e706745806921cea5c45700e13ebe16d834b5e3c0b7ad83bf6da1f28b0634e11
-		   66afca2b308351b180136cf899a3b22865af1a775efaf74dc8a10c96d4721c5a)
+TERMUX_PKG_VERSION=7.0.0
+TERMUX_PKG_SHA256=(8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222
+		   550212711c752697d2f82c648714a7221b1207fd9441543ff4aa9e3be45bba55
+		   fbcf47c5e543f4cdac6bb9bbbc6327ff24217cd7eafc5571549ad6d237287f9c
+		   30662b632f5556c59ee9215c1309f61de50b3ea8e89dcc28ba9a9494bba238ff)
 TERMUX_PKG_SRCURL=(https://releases.llvm.org/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 		   https://releases.llvm.org/${TERMUX_PKG_VERSION}/cfe-${TERMUX_PKG_VERSION}.src.tar.xz
 		   https://llvm.org/releases/${TERMUX_PKG_VERSION}/lld-${TERMUX_PKG_VERSION}.src.tar.xz
@@ -107,7 +106,7 @@ termux_step_post_make_install () {
 	cd $TERMUX_PREFIX/bin
 
 	for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{clang,clang++,gcc,g++,cpp}; do
-		ln -f -s clang-${_PKG_MAJOR_VERSION} $tool
+		ln -f -s clang-${TERMUX_PKG_VERSION:0:1} $tool
 	done
 }
 
diff --git a/packages/libllvm/docs-AMDGPUUsage.rst.patch b/packages/libllvm/docs-AMDGPUUsage.rst.patch
deleted file mode 100644
index b489027ff..000000000
--- a/packages/libllvm/docs-AMDGPUUsage.rst.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove unreferenced footnotes which causes a build failure on ubuntu 18.04
-
-diff -u -r ../llvm-6.0.0.src/docs/AMDGPUUsage.rst ./docs/AMDGPUUsage.rst
---- ../llvm-6.0.0.src/docs/AMDGPUUsage.rst	2017-12-12 06:47:00.000000000 +0100
-+++ ./docs/AMDGPUUsage.rst	2018-04-30 00:58:07.492244676 +0200
-@@ -4142,8 +4142,6 @@
- .. [AMD-GCN-GFX7] `AMD Sea Islands Series ISA <http://developer.amd.com/wordpress/media/2013/07/AMD_Sea_Islands_Instruction_Set_Architecture.pdf>`_
- .. [AMD-GCN-GFX8] `AMD GCN3 Instruction Set Architecture <http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2013/12/AMD_GCN3_Instruction_Set_Architecture_rev1.1.pdf>`__
- .. [AMD-GCN-GFX9] `AMD "Vega" Instruction Set Architecture <http://developer.amd.com/wordpress/media/2013/12/Vega_Shader_ISA_28July2017.pdf>`__
--.. [AMD-OpenCL_Programming-Guide]  `AMD Accelerated Parallel Processing OpenCL Programming Guide <http://developer.amd.com/download/AMD_Accelerated_Parallel_Processing_OpenCL_Programming_Guide.pdf>`_
--.. [AMD-APP-SDK] `AMD Accelerated Parallel Processing APP SDK Documentation <http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/documentation/>`__
- .. [AMD-ROCm] `ROCm: Open Platform for Development, Discovery and Education Around GPU Computing <http://gpuopen.com/compute-product/rocm/>`__
- .. [AMD-ROCm-github] `ROCm github <http://github.com/RadeonOpenCompute>`__
- .. [HSA] `Heterogeneous System Architecture (HSA) Foundation <http://www.hsafoundation.com/>`__
-@@ -4152,4 +4150,3 @@
- .. [YAML] `YAML Ain't Markup Language (YAML™) Version 1.2 <http://www.yaml.org/spec/1.2/spec.html>`__
- .. [OpenCL] `The OpenCL Specification Version 2.0 <http://www.khronos.org/registry/cl/specs/opencl-2.0.pdf>`__
- .. [HRF] `Heterogeneous-race-free Memory Models <http://benedictgaster.org/wp-content/uploads/2014/01/asplos269-FINAL.pdf>`__
--.. [AMD-AMDGPU-Compute-Application-Binary-Interface] `AMDGPU Compute Application Binary Interface <https://github.com/RadeonOpenCompute/ROCm-ComputeABI-Doc/blob/master/AMDGPU-ABI.md>`__
diff --git a/packages/libllvm/docs-Proposals-VectorizationPlan.rst.patch b/packages/libllvm/docs-Proposals-VectorizationPlan.rst.patch
deleted file mode 100644
index 3338f8e33..000000000
--- a/packages/libllvm/docs-Proposals-VectorizationPlan.rst.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Remove unreferenced footnotes which causes a build failure on ubuntu 18.04
-
-diff -u -r ../llvm-6.0.0.src/docs/Proposals/VectorizationPlan.rst ./docs/Proposals/VectorizationPlan.rst
---- ../llvm-6.0.0.src/docs/Proposals/VectorizationPlan.rst	2017-11-20 13:01:47.000000000 +0100
-+++ ./docs/Proposals/VectorizationPlan.rst	2018-04-30 00:30:45.270760735 +0200
-@@ -212,7 +212,7 @@
-    Polly [7]_.
- 
- 3. Loop Vectorizer: the Vectorization Plan aims to upgrade the infrastructure of
--   the Loop Vectorizer and extend it to handle outer loops [8,9]_.
-+   the Loop Vectorizer and extend it to handle outer loops [8]_, [9]_.
- 
- References
- ----------
diff --git a/packages/lldb/build.sh b/packages/lldb/build.sh
index 6da09301d..fdb45cbf7 100644
--- a/packages/lldb/build.sh
+++ b/packages/lldb/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://lldb.llvm.org
 TERMUX_PKG_DESCRIPTION="LLVM based debugger"
-TERMUX_PKG_VERSION=6.0.1
-TERMUX_PKG_SHA256=6b8573841f2f7b60ffab9715c55dceff4f2a44e5a6d590ac189d20e8e7472714
+TERMUX_PKG_VERSION=7.0.0
+TERMUX_PKG_SHA256=7ff6d8fee49977d25b3b69be7d22937b92592c7609cf283ed0dcf9e5cd80aa32
 TERMUX_PKG_SRCURL=https://releases.llvm.org/${TERMUX_PKG_VERSION}/lldb-$TERMUX_PKG_VERSION.src.tar.xz
 TERMUX_PKG_DEPENDS="libedit, libllvm, libxml2, ncurses-ui-libs"
 TERMUX_PKG_BLACKLISTED_ARCHES="i686"