From dd89574eb557545c6046c51448c589909b6955a0 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dpark@linux.microsoft.com>
Date: Wed, 2 Feb 2022 14:24:34 +0100
Subject: [PATCH] sys-devel/gcc: update to 10.3.0

Update sys-devel/gcc to 10.3.0.
See also https://gcc.gnu.org/gcc-10/changes.html.
---
 .../portage-stable/sys-devel/gcc/Manifest     |  4 ++--
 ...{gcc-9.4.0.ebuild => gcc-10.3.0-r2.ebuild} | 19 ++++++++++++-------
 .../portage-stable/sys-devel/gcc/metadata.xml |  1 +
 3 files changed, 15 insertions(+), 9 deletions(-)
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-9.4.0.ebuild => gcc-10.3.0-r2.ebuild} (52%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
index af7a70210d..1bfa55c4fe 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
@@ -1,2 +1,2 @@
-DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
-DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
+DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
+DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.3.0-r2.ebuild
similarity index 52%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.4.0.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.3.0-r2.ebuild
index 7c210388c0..0fc4ea78dc 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.4.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.3.0-r2.ebuild
@@ -3,17 +3,22 @@
 
 EAPI="7"
 
-PATCH_VER="1"
+PATCH_VER="3"
 MUSL_VER="1"
+
 inherit toolchain
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
+BDEPEND="${CATEGORY}/binutils"
 
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
+src_prepare() {
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
index 903272c074..8730f85e65 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="ada">Build the ADA language (GNAT) frontend</flag>
     <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
       (AWT) peer support on top of GTK+</flag>
+    <flag name="cet" restrict="&gt;=sys-devel/gcc-10">Enable support for Intel Control Flow Enforcement Technology (CET)</flag>
     <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag>
     <flag name="d">Enable support for the D programming language</flag>
     <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets