From 0b77700f7994c942111c55fb325b8c3239b70b76 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 11 Jun 2021 21:05:24 +0200
Subject: [PATCH] cross/gcc-*: rebuild with changes from Alpine

ERROR: unable to select packages:
  libstdc++-10.3.1_git20210424-r1:
    breaks: g++-aarch64-10.3.1_git20210424-r0[libstdc++=10.3.1_git20210424-r0]
    satisfies: g++-10.3.1_git20210424-r1[libstdc++=10.3.1_git20210424-r1]
               g++-10.3.1_git20210424-r1[libstdc++=10.3.1_git20210424-r1]
               gcc-10.3.1_git20210424-r1[so:libstdc++.so.6]
               libgmpxx-6.2.1-r0[so:libstdc++.so.6]
               binutils-aarch64-2.35.2-r2[so:libstdc++.so.6]
               binutils-2.35.2-r2[so:libstdc++.so.6]
               ccache-4.3-r0[so:libstdc++.so.6]
               lzip-1.22-r0[so:libstdc++.so.6]
  gcc-10.3.1_git20210424-r1:
    breaks: g++-aarch64-10.3.1_git20210424-r0[gcc=10.3.1_git20210424-r0]
    satisfies: g++-10.3.1_git20210424-r1[gcc=10.3.1_git20210424-r1]
               build-base-0.5-r2[gcc]
---
 cross/gcc-aarch64/APKBUILD | 13 +++++++++++--
 cross/gcc-armhf/APKBUILD   | 13 +++++++++++--
 cross/gcc-armv7/APKBUILD   | 13 +++++++++++--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index a269c9fb5..aa441ce23 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -116,12 +116,16 @@ fi
 
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-[ "$CARCH" = ppc64le ] && LANG_D=false
+# riscv fails with: error: static assert  "unimplemented"
+case "$CARCH" in
+ppc64le|riscv64)	LANG_D=false ;;
+esac
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
+riscv64)	_libitm=false ;;
 esac
 
 # Internal libffi fails to build on MIPS at the moment, need to
@@ -148,6 +152,11 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 3a00e8e00..dc28bd888 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -116,12 +116,16 @@ fi
 
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-[ "$CARCH" = ppc64le ] && LANG_D=false
+# riscv fails with: error: static assert  "unimplemented"
+case "$CARCH" in
+ppc64le|riscv64)	LANG_D=false ;;
+esac
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
+riscv64)	_libitm=false ;;
 esac
 
 # Internal libffi fails to build on MIPS at the moment, need to
@@ -148,6 +152,11 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index ef40a35e1..16ce442b5 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -116,12 +116,16 @@ fi
 
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-[ "$CARCH" = ppc64le ] && LANG_D=false
+# riscv fails with: error: static assert  "unimplemented"
+case "$CARCH" in
+ppc64le|riscv64)	LANG_D=false ;;
+esac
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
+riscv64)	_libitm=false ;;
 esac
 
 # Internal libffi fails to build on MIPS at the moment, need to
@@ -148,6 +152,11 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"