Fixed: Cilk++ support was dropped

2 files changed, 16 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1ff08058c5b..2f26b44c9a9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May 10 22:51:13 UTC 2017
+# Fri Dec 15 00:56:23 UTC 2017
 pkgbase = gcc-multilib-trunk-git
 	pkgdesc = The GNU Compiler Collection developmental snapshot
-	pkgver = 8.0.0.r153878.495cd7fe2dc
+	pkgver = 8.0.0.r158636.6b74e46fb96
 	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = any
@@ -24,11 +24,11 @@ pkgname = gcc-multilib-git
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends for multilib
 	install = gcc.install
 	groups = multilib-devel
-	depends = gcc-libs-multilib-git=8.0.0.r153878.495cd7fe2dc-1
+	depends = gcc-libs-multilib-git=8.0.0.r158636.6b74e46fb96-1
 	depends = binutils>=2.25
 	depends = libmpc
-	provides = gcc=8.0.0.r153878.495cd7fe2dc-1
-	provides = gcc-multilib=8.0.0.r153878.495cd7fe2dc-1
+	provides = gcc=8.0.0.r158636.6b74e46fb96-1
+	provides = gcc-multilib=8.0.0.r158636.6b74e46fb96-1
 	conflicts = gcc
 	options = staticlibs
 
@@ -36,9 +36,9 @@ pkgname = gcc-libs-multilib-git
 	pkgdesc = Runtime libraries shipped by GCC for multilib
 	install = gcc-libs.install
 	depends = glibc>=2.20
-	depends = lib32-gcc-libs-git=8.0.0.r153878.495cd7fe2dc-1
-	provides = gcc-libs=8.0.0.r153878.495cd7fe2dc-1
-	provides = gcc-libs-multilib=8.0.0.r153878.495cd7fe2dc-1
+	depends = lib32-gcc-libs-git=8.0.0.r158636.6b74e46fb96-1
+	provides = gcc-libs=8.0.0.r158636.6b74e46fb96-1
+	provides = gcc-libs-multilib=8.0.0.r158636.6b74e46fb96-1
 	conflicts = gcc-libs
 	options = !emptydirs
 	options = !strip
@@ -46,14 +46,14 @@ pkgname = gcc-libs-multilib-git
 pkgname = lib32-gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC (32-bit)
 	depends = lib32-glibc>=2.20
-	provides = lib32-gcc-libs=8.0.0.r153878.495cd7fe2dc-1
+	provides = lib32-gcc-libs=8.0.0.r158636.6b74e46fb96-1
 	conflicts = lib32-gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-objc-multilib-git
 	pkgdesc = Objective-C front-end for GCC for multilib
-	depends = gcc-multilib-git=8.0.0.r153878.495cd7fe2dc-1
-	provides = gcc-objc=8.0.0.r153878.495cd7fe2dc-1
+	depends = gcc-multilib-git=8.0.0.r158636.6b74e46fb96-1
+	provides = gcc-objc=8.0.0.r158636.6b74e46fb96-1
 	conflicts = gcc-objc
 
diff --git a/PKGBUILD b/PKGBUILD
index 34b0690254aa..6ef02e3f0a1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,5 @@
+# Maintainer: Philipp Claßen <philipp.classen@posteo.de>
+#
 # Concerning the _pkgver_base HACK (copied from gcc-git AUR):
 #
 #    * _pkgver_base is hard coded at the moment to 6.0.0; can't parse from source
@@ -8,7 +10,7 @@
 
 pkgbase="gcc-multilib-trunk-git"
 pkgname=('gcc-multilib-git' 'gcc-libs-multilib-git' 'lib32-gcc-libs-git' 'gcc-objc-multilib-git')
-pkgver=8.0.0.r153878.495cd7fe2dc
+pkgver=8.0.0.r158636.6b74e46fb96
 _pkgver_base=8.0.0
 pkgrel=1
 pkgdesc="The GNU Compiler Collection developmental snapshot"
@@ -144,15 +146,12 @@ package_gcc-multilib-git()
         make -C gcc DESTDIR=${pkgdir} install-mkheaders
         make -C lto-plugin DESTDIR=${pkgdir} install
 
-        make -C $_CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
-        install-nodist_cilkincludeHEADERS
         make -C $_CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
         install-nodist_libsubincludeHEADERS
         make -C $_CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
         make -C $_CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
         make -C $_CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
         make -C $_CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-        make -C $_CHOST/32/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
         make -C $_CHOST/32/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
         make -C $_CHOST/32/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
         make -C $_CHOST/32/libsanitizer DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
@@ -227,7 +226,7 @@ package_gcc-libs-multilib-git()
         make -C $_CHOST/libgcc DESTDIR=${pkgdir} install-shared
         [ -f ${pkgdir}/${_libdir}/libgcc_eh.a ] && rm ${pkgdir}/${_libdir}/libgcc_eh.a
 
-        for lib in libatomic libcilkrts libgfortran libgomp \
+        for lib in libatomic libgfortran libgomp \
         libitm libquadmath libsanitizer/{a,l,ub}san libstdc++-v3/src libvtv; do
                 [ -d $_CHOST/$lib ] && make -C $_CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
         done
@@ -264,7 +263,7 @@ package_lib32-gcc-libs-git()
         make -C $_CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
         [ -f ${pkgdir}/${_libdir}/32/libgcc_eh.a ] && rm ${pkgdir}/${_libdir}/32/libgcc_eh.a
 
-        for lib in libatomic libcilkrts libgfortran libgomp libitm libquadmath \
+        for lib in libatomic libgfortran libgomp libitm libquadmath \
         libsanitizer/{a,l,ub}san libstdc++-v3/src libvtv; do
                 [ -d $_CHOST/32/$lib ] && make -C $_CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
         done