Merge branch '3.7-alpha0' into 3.7

3 files changed, 22 insertions, 44 deletions

diff --git a/gcc/.footprint b/gcc/.footprint
index d182f81f..6b65f455 100644
--- a/gcc/.footprint
+++ b/gcc/.footprint
@@ -896,7 +896,6 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/libgcc_eh.a
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/libgcov.a
 -rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/cc1
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/cc1obj
 -rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/cc1plus
 -rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/collect2
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtbegin.o
@@ -979,17 +978,6 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/movdirintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/mwaitxintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/nmmintrin.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/NXConstStr.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/Object.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/Protocol.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/message.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/objc-decls.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/objc-exception.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/objc-sync.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/objc.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/runtime.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/objc/thr.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/omp.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/openacc.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/pconfigintrin.h
@@ -1566,11 +1554,6 @@ lrwxrwxrwx	root/root	usr/lib/liblsan.so -> liblsan.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/liblsan.so.0 -> liblsan.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/liblsan.so.0.0.0
 -rw-r--r--	root/root	usr/lib/liblsan_preinit.o
--rw-r--r--	root/root	usr/lib/libobjc.a
--rwxr-xr-x	root/root	usr/lib/libobjc.la
-lrwxrwxrwx	root/root	usr/lib/libobjc.so -> libobjc.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib/libobjc.so.4 -> libobjc.so.4.0.0
--rwxr-xr-x	root/root	usr/lib/libobjc.so.4.0.0
 -rw-r--r--	root/root	usr/lib/libquadmath.a
 -rwxr-xr-x	root/root	usr/lib/libquadmath.la
 lrwxrwxrwx	root/root	usr/lib/libquadmath.so -> libquadmath.so.0.0.0
@@ -1630,11 +1613,6 @@ lrwxrwxrwx	root/root	usr/lib32/libitm.so -> libitm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib32/libitm.so.1 -> libitm.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib32/libitm.so.1.0.0
 -rw-r--r--	root/root	usr/lib32/libitm.spec
--rw-r--r--	root/root	usr/lib32/libobjc.a
--rwxr-xr-x	root/root	usr/lib32/libobjc.la
-lrwxrwxrwx	root/root	usr/lib32/libobjc.so -> libobjc.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib32/libobjc.so.4 -> libobjc.so.4.0.0
--rwxr-xr-x	root/root	usr/lib32/libobjc.so.4.0.0
 -rw-r--r--	root/root	usr/lib32/libquadmath.a
 -rwxr-xr-x	root/root	usr/lib32/libquadmath.la
 lrwxrwxrwx	root/root	usr/lib32/libquadmath.so -> libquadmath.so.0.0.0
diff --git a/gcc/.signature b/gcc/.signature
index 2471f00b..0f764283 100644
--- a/gcc/.signature
+++ b/gcc/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqjIzURyJrP7qRAsOp5lhAOu1jS8rAkx9cInRMT+1GQEty8zowgpT4hG7VcuUvyDeQDlmCu+33nZZkgfFvxGqBA0=
-SHA256 (Pkgfile) = ea862f4f19e7cebe883156fbd34e2be505198d8e36ad198d905a0fd5128f693d
-SHA256 (.footprint) = c50b396f39837f01035fd00bb474e78027b83284f3f0fa6c23bf4fea252137f9
+RWRJc1FUaeVeqlrlg7YTB1YMtNamGHjI2YN1U3YuyE8lpzp+NypxkWMZmoziyQjIZpJ9bOdfiQhJ4lhmvtuEBpRSO53PKw43ZQQ=
+SHA256 (Pkgfile) = c16eb399115423efcfae0e87e98bf3b4623645e0127216d6fdb6c153add3732b
+SHA256 (.footprint) = 0ef47247dcb35c845297174e335713879b5ea8a6f4183622e5aa2f702f897d78
 SHA256 (gcc-11.2.0.tar.xz) = d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
 SHA256 (gcc-nocheck-fixincludes.patch) = 850a71d2c64b9f2bec31821bd972bf89c2d57764faf64948100eaf474fd63bbb
 SHA256 (gcc-4.7.3-multilib-dirs.patch) = 149b151999d0afad909ca0d1eaf1f9a81c9cd6499e56989ec4fc574d108eeef6
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index b68b3981..38162485 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -1,7 +1,7 @@
 # Description: The GNU Compiler Collection
-# URL: http://gcc.gnu.org
+# URL: https://gcc.gnu.org
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: zlib libmpc zstd
+# Depends on: libmpc zlib zstd
 
 name=gcc
 version=11.2.0
@@ -9,38 +9,38 @@ release=1
 source=(https://sourceware.org/pub/gcc/releases/gcc-$version/$name-$version.tar.xz
 	$name-nocheck-fixincludes.patch $name-4.7.3-multilib-dirs.patch)
 
-unpack_source() {
-	for file in ${source[@]}; do
-		case ${file##*/} in
-			${name#*-}-$version.tar.xz)
-				tar xf $(get_filename $file) -C $SRC ;;
-			*)
-				cp $(get_filename $file) $SRC ;;
-		esac
-	done
-}
-
 build() {
+	# fix libasan.a
+	sed -e '/static.*SIGSTKSZ/d' \
+		-e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
+		-i $name-$version/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
+
 	patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch
 	patch -d $name-$version -p1 -i $SRC/$name-4.7.3-multilib-dirs.patch
 
+	# pipe fails tests
+	CFLAGS=${CFLAGS/-pipe/}
+	CXXFLAGS=${CXXFLAGS/-pipe/}
+
 	mkdir build
 	cd build
 	../$name-$version/configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
-		--enable-languages=c,c++,objc \
+		--enable-languages=c,c++,lto \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
 		--enable-clocale=gnu \
 		--enable-shared \
-		--disable-nls \
+		--enable-lto \
 		--with-x=no \
-		--with-system-zlib \
 		--enable-multilib \
+		--enable-plugin \
 		--enable-default-pie \
 		--enable-default-ssp \
-		--with-pkgversion="CRUX-x86_64-multilib"
+		--with-pkgversion="CRUX-x86_64-multilib" \
+		--with-system-zlib \
+		--disable-nls
 	make bootstrap
 	make -j1 DESTDIR=$PKG install
 
@@ -50,9 +50,9 @@ build() {
 	ln -sf g++ $PKG/usr/bin/c++
 
 	mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
-	rm -r $PKG/usr/share/{info,$name-$version} 
+	rm -r $PKG/usr/share/{info,$name-$version}
 	rm -r $PKG/usr/bin/*-linux-gnu-*
-	rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} 
+	rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
 
 	for D in lib{,32}; do
 		install -d -m 0755 $PKG/usr/share/gdb/auto-load/usr/${D}