From 95256495e29ad7b5320a1237fbdf74f54647913b Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 23 Dec 2018 18:24:12 +0000
Subject: [PATCH] gcc: enable sanitizer for aarch64 architecture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]

Closes: #6160 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/gcc/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index cf1460c4306..59bfab1a635 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,4 +1,4 @@
-# Template build file for 'gcc'.
+# Template file for 'gcc'
 _majorver=8.2
 _gmp_version=6.1.2
 _mpfr_version=4.0.1
@@ -7,16 +7,16 @@ _isl_version=0.19
 
 pkgname=gcc
 version=${_majorver}.0
-revision=7
+revision=8
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
-license="GFDL-1.2, GPL-3, LGPL-2.1"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 # *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 distfiles="
  https://fossies.org/linux/misc/gcc-${version}.tar.xz
  https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
- http://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
+ https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
  https://fossies.org/linux/misc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
 checksum="
@@ -103,7 +103,6 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	 depends+=" musl-devel";;
-	aarch64) depends+=" glibc-devel";;
 	*) 	 depends+=" glibc-devel"
 		 subpackages+=" libsanitizer libsanitizer-devel"
 		 ;;
@@ -205,7 +204,7 @@ do_configure() {
 	fi
 
 	case "$XBPS_TARGET_MACHINE" in
-		aarch64*|*-musl) _args+=" --disable-libsanitizer";;
+		*-musl) _args+=" --disable-libsanitizer";;
 	esac
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) _args+=" --disable-symvers"