From d020ab99e74bc7871ea33ee4c843ebc5226fcae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 16 Aug 2017 17:29:40 +0200
Subject: [PATCH] cross-i686-linux-musl: update to 0.24 (gcc-7.2.0)

---
 .../files/gcc-6.3.0-musl.diff                   |  1 -
 .../files/libcpp-source_date_epoch.patch        |  1 -
 .../files/no-stack_chk_fail_local.patch         |  1 +
 srcpkgs/cross-i686-linux-musl/template          | 17 +++++++++--------
 4 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/gcc-6.3.0-musl.diff
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/libcpp-source_date_epoch.patch
 create mode 120000 srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch

diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-6.3.0-musl.diff b/srcpkgs/cross-i686-linux-musl/files/gcc-6.3.0-musl.diff
deleted file mode 120000
index 5c5bfaadc46..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/gcc-6.3.0-musl.diff
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gcc-6.3.0-musl.diff
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/libcpp-source_date_epoch.patch b/srcpkgs/cross-i686-linux-musl/files/libcpp-source_date_epoch.patch
deleted file mode 120000
index e1d4856827d..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/libcpp-source_date_epoch.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libcpp-source_date_epoch.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch b/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch
new file mode 120000
index 00000000000..730486bacb5
--- /dev/null
+++ b/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch
@@ -0,0 +1 @@
+../../gcc/patches/no-stack_chk_fail_local.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 23a36262b42..b94b7bfe560 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-i686-linux-musl'
 #
 _binutils_version=2.29
-_gcc_version=6.3.0
+_gcc_version=7.2.0
 _musl_version=1.1.16
 _linux_version=4.9.8
 
@@ -10,20 +10,20 @@ _sysroot="/usr/${_triplet}"
 _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
-version=0.23
-revision=3
+version=0.24
+revision=1
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
 license="GPL-3, GPL-2, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf
- f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
+ 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a
  150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45
  937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011"
 
@@ -82,9 +82,8 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p1 ${FILESDIR}/gcc-6.3.0-musl.diff
-	_apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
+	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -96,8 +95,8 @@ _gcc_bootstrap() {
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --enable-languages=c"
 	_args+=" --with-newlib"
-	_args+=" --disable-libssp"
 	_args+=" --disable-nls"
+	_args+=" --disable-libssp"
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-threads"
 	_args+=" --disable-decimal-float"
@@ -166,6 +165,8 @@ _gcc_build() {
 	_args+=" --prefix=/usr"
 	_args+=" --enable-languages=c,c++,fortran,lto"
 	_args+=" --enable-lto"
+	_args+=" --enable-default-pie"
+	_args+=" --enable-default-ssp"
 	_args+=" --disable-libsanitizer"
 	_args+=" --disable-multilib"
 	_args+=" --disable-libmpx"