From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 26 Dec 2018 01:28:47 +0000 (+0000)
Subject: Change triplet in debian/rules to use armv6k rather than armv7l
X-Git-Tag: archive/raspbian/1%7.0.1-1+rpi2^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1fdd34aad4b0e4a97fecd9cf0106fc367fcddeee;p=llvm-toolchain-7.git

Change triplet in debian/rules to use armv6k rather than armv7l
---

diff --git a/debian/changelog b/debian/changelog
index e9c945029..aed84d5d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-7 (1:7.0.1-1+rpi1) buster-staging; urgency=medium
+llvm-toolchain-7 (1:7.0.1-1+rpi2) buster-staging; urgency=medium
 
   [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
   * Cleanup .pyc files in clean target.
@@ -31,6 +31,9 @@ llvm-toolchain-7 (1:7.0.1-1+rpi1) buster-staging; urgency=medium
     git/dgit happy.
   * Yet more clean target fixes.
 
+  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
+  * Change triplet in debian/rules to use armv6k rather than armv7l
+
  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 24 Dec 2018 21:11:43 +0000
 
 llvm-toolchain-7 (1:7.0.1-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index aa0e479f2..f41ba124f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,7 +90,7 @@ endif
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
 # avoid an issue with openmp on armhf
-  CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=armv7l-unknown-linux-gnueabihf
+  CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=armv6k-unknown-linux-gnueabihf
 endif
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)