commit: 57ab40882690719109d8ea0e989d6f0353472364 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 17 12:03:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 17 12:03:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ab4088
sys-devel/gcc: drop old 13 snapshots Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 - ...gcc-13.0.1_pre20230409-PR109434-DSE-throw.patch | 63 --------------------- ...-clang-LocalizationChecker-ranger-any-PHI.patch | 46 --------------- ....1_pre20230409-PR109469-SLP-returns-twice.patch | 66 ---------------------- ...pre20230409-PR109473-ICE-reduction-epilog.patch | 58 ------------------- sys-devel/gcc/gcc-13.0.1_pre20230409-r1.ebuild | 56 ------------------ sys-devel/gcc/gcc-13.0.1_pre20230409-r2.ebuild | 57 ------------------- sys-devel/gcc/gcc-13.0.1_pre20230409-r3.ebuild | 58 ------------------- sys-devel/gcc/gcc-13.0.1_pre20230409-r4.ebuild | 60 -------------------- sys-devel/gcc/gcc-13.0.1_pre20230409.ebuild | 56 ------------------ 10 files changed, 521 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 3921631e9688..fdc8c8a0f9a1 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -27,7 +27,6 @@ DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d DIST gcc-12.2.0-patches-14.tar.xz 13752 BLAKE2B c44609a8a3a96480f144b7e6859c2b1d7105f421ffa08929c35fc13eb5ec11d967b02cf8248ecb4ea85824b1872125a73c92f404050c3399d5c06fe668711fd3 SHA512 c1db7a7f3a929dfdc8de9a662448f57296ab818b9fd133763b2ab0dddce2e01cf322e5ac53f3d69c2366053ef3c4fa44c72eed248dc7aeef49f558341bdd3854 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 -DIST gcc-13-20230409.tar.xz 83942252 BLAKE2B 9fb394de80814c13f91ea1cc078e9ab5623576d67115f61b6090594d44ed9179445fe58fc35f509e9bfcc2c7305e8e111c24df4f2f62fe134eb24b09f7c15b7f SHA512 6b2fb29abf0ed77dcccd393d8ec0b8abc2d7aada0de6bab20eb561fd3f738c4b5023fb5598ffb017d10f099d597ddbc324a6dc71d5ed0119a7d9a7ef1faec1a1 DIST gcc-13-20230416.tar.xz 83936936 BLAKE2B c052fff2838a0bdd87f90345a5f7f5c607a6fe360b02ce8cb076f6dd3a62f6aae0c7d3914eee447e9c92c971331ddcbf0c94f2aa120aef89a742162b5e7dbfdd SHA512 222bb6db05b23aeb428262c69319a4964097065a88a5ae6c19b104c31af82c465f139c08f01bb077b0e776685769b77a54b772ebc4e2057e7c3e8954283997cf DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681 DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba SHA512 98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290 diff --git a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109434-DSE-throw.patch b/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109434-DSE-throw.patch deleted file mode 100644 index 5d45d8f4e018..000000000000 --- a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109434-DSE-throw.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6e3e708dbadaae7b504af7fc4410015624793f02 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109434 - -From 6e3e708dbadaae7b504af7fc4410015624793f02 Mon Sep 17 00:00:00 2001 -From: Richard Biener <[email protected]> -Date: Tue, 11 Apr 2023 15:06:59 +0200 -Subject: [PATCH] tree-optimization/109434 - bogus DSE of throwing call LHS - -The byte tracking of call LHS didn't properly handle possibly -throwing calls correctly which cases bogus DSE and in turn, for the -testcase a bogus uninit diagnostic and (unreliable) wrong-code. - - PR tree-optimization/109434 - * tree-ssa-dse.cc (initialize_ao_ref_for_dse): Properly - handle possibly throwing calls when processing the LHS - and may-defs are not OK. - - * g++.dg/opt/pr109434.C: New testcase. ---- /dev/null -+++ b/gcc/testsuite/g++.dg/opt/pr109434.C -@@ -0,0 +1,28 @@ -+// { dg-do compile } -+// { dg-require-effective-target c++17 } -+// { dg-options "-O2 -Wall" } -+ -+#include <optional> -+#include <stdexcept> -+ -+std::optional<int> foo() -+{ -+ volatile int x = 1; -+ if (x) -+ throw std::runtime_error("haha"); -+ return 42; -+} -+ -+int main() -+{ -+ std::optional<int> optInt; -+ try { -+ // We falsely DSEd the LHS of the call even though foo throws -+ // which results in an uninitialized diagnostic -+ optInt = foo(); -+ } catch (...) { -+ return optInt.has_value(); -+ } -+ std::optional<double> optDbl{optInt}; -+ return optDbl ? optDbl.value () : 2.0; -+} ---- a/gcc/tree-ssa-dse.cc -+++ b/gcc/tree-ssa-dse.cc -@@ -179,7 +179,8 @@ initialize_ao_ref_for_dse (gimple *stmt, ao_ref *write, bool may_def_ok = false) - } - if (tree lhs = gimple_get_lhs (stmt)) - { -- if (TREE_CODE (lhs) != SSA_NAME) -+ if (TREE_CODE (lhs) != SSA_NAME -+ && (may_def_ok || !stmt_could_throw_p (cfun, stmt))) - { - ao_ref_init (write, lhs); - return true; --- -2.31.1 diff --git a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109462-clang-LocalizationChecker-ranger-any-PHI.patch b/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109462-clang-LocalizationChecker-ranger-any-PHI.patch deleted file mode 100644 index 2b5ea5ad826a..000000000000 --- a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109462-clang-LocalizationChecker-ranger-any-PHI.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109462 -https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=24af552876eff707f75d30d3f0f0e7a5d62dd857 - -From 24af552876eff707f75d30d3f0f0e7a5d62dd857 Mon Sep 17 00:00:00 2001 -From: Andrew MacLeod <[email protected]> -Date: Tue, 11 Apr 2023 17:29:03 -0400 -Subject: [PATCH] Don't use ANY PHI equivalences in range-on-entry. - -PR 108139 dissallows PHI equivalencies in the on-entry calculator, but -it was only checking if the equivlaence was a PHI. In this case, NAME -itself is a PHI with an equivlaence caused by an undefined value, so we -also need to check that case. Unfortunately this un-fixes 101912. - - PR tree-optimization/109462 - gcc/ - * gimple-range-cache.cc (ranger_cache::fill_block_cache): Don't - check for equivalences if NAME is a phi node. - - gcc/testsuite/ - * gcc.dg/uninit-pr101912.c: XFAIL the warning. ---- a/gcc/gimple-range-cache.cc -+++ b/gcc/gimple-range-cache.cc -@@ -1218,7 +1218,9 @@ ranger_cache::fill_block_cache (tree name, basic_block bb, basic_block def_bb) - fprintf (dump_file, "\n"); - } - // See if any equivalences can refine it. -- if (m_oracle) -+ // PR 109462, like 108139 below, a one way equivalence introduced -+ // by a PHI node can also be through the definition side. Disallow it. -+ if (m_oracle && !is_a<gphi *> (SSA_NAME_DEF_STMT (name))) - { - tree equiv_name; - relation_kind rel; ---- a/gcc/testsuite/gcc.dg/uninit-pr101912.c -+++ b/gcc/testsuite/gcc.dg/uninit-pr101912.c -@@ -11,7 +11,7 @@ tzloadbody (void) - for (int i = 0; i < n; i++) - { - int corr = getint (); -- if (corr < 1 || (corr == 1 && !(leapcnt == 0 || (prevcorr < corr ? corr == prevcorr + 1 : (corr == prevcorr || corr == prevcorr - 1))))) /* { dg-bogus "uninitialized" } */ -+ if (corr < 1 || (corr == 1 && !(leapcnt == 0 || (prevcorr < corr ? corr == prevcorr + 1 : (corr == prevcorr || corr == prevcorr - 1))))) /* { dg-bogus "uninitialized" "pr101912" { xfail *-*-* } } */ - return -1; - - prevcorr = corr; --- -2.31.1 diff --git a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109469-SLP-returns-twice.patch b/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109469-SLP-returns-twice.patch deleted file mode 100644 index 7d45c9e60af8..000000000000 --- a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109469-SLP-returns-twice.patch +++ /dev/null @@ -1,66 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109469 -https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2d7ad38707e1fd71193d440198cc0726092b9015 - -From 2d7ad38707e1fd71193d440198cc0726092b9015 Mon Sep 17 00:00:00 2001 -From: Richard Biener <[email protected]> -Date: Tue, 11 Apr 2023 16:06:12 +0200 -Subject: [PATCH] tree-optimization/109469 - SLP with returns-twice region - start - -The following avoids an SLP region starting with a returns-twice -call where we cannot insert stmts at the head. - - PR tree-optimization/109469 - * tree-vect-slp.cc (vect_slp_function): Skip region starts with - a returns-twice call. - - * gcc.dg/torture/pr109469.c: New testcase. ---- /dev/null -+++ b/gcc/testsuite/gcc.dg/torture/pr109469.c -@@ -0,0 +1,15 @@ -+/* { dg-do compile } */ -+ -+__attribute__((returns_twice)) int foo(); -+ -+struct xio myproc; -+struct xio { -+ void (*read_proc)(); -+ void (*write_proc)(); -+}; -+ -+void dummy_write_proc() { -+ switch (foo()) -+ default: -+ myproc.read_proc = myproc.write_proc = dummy_write_proc; -+} ---- a/gcc/tree-vect-slp.cc -+++ b/gcc/tree-vect-slp.cc -@@ -7671,10 +7671,23 @@ vect_slp_function (function *fun) - { - r |= vect_slp_bbs (bbs, NULL); - bbs.truncate (0); -- bbs.quick_push (bb); - } -- else -- bbs.safe_push (bb); -+ -+ /* We need to be able to insert at the head of the region which -+ we cannot for region starting with a returns-twice call. */ -+ if (bbs.is_empty ()) -+ if (gcall *first = safe_dyn_cast <gcall *> (first_stmt (bb))) -+ if (gimple_call_flags (first) & ECF_RETURNS_TWICE) -+ { -+ if (dump_enabled_p ()) -+ dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, -+ "skipping bb%d as start of region as it " -+ "starts with returns-twice call\n", -+ bb->index); -+ continue; -+ } -+ -+ bbs.safe_push (bb); - - /* When we have a stmt ending this block and defining a - value we have to insert on edges when inserting after it for --- -2.31.1 diff --git a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109473-ICE-reduction-epilog.patch b/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109473-ICE-reduction-epilog.patch deleted file mode 100644 index cab26653a09d..000000000000 --- a/sys-devel/gcc/files/gcc-13.0.1_pre20230409-PR109473-ICE-reduction-epilog.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=df7f55cb2ae550adeda339a57b657ebe1ad39367 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109473 - -From df7f55cb2ae550adeda339a57b657ebe1ad39367 Mon Sep 17 00:00:00 2001 -From: Richard Biener <[email protected]> -Date: Wed, 12 Apr 2023 10:22:08 +0200 -Subject: [PATCH] tree-optimization/109473 - ICE with reduction epilog - adjustment op - -The following makes sure to carry out the reduction epilog adjustment -in the original computation type which for pointers is an unsigned -integer type. There's a similar issue with signed vs. unsigned ops -and overflow which is fixed by this as well. - - PR tree-optimization/109473 - * tree-vect-loop.cc (vect_create_epilog_for_reduction): - Convert scalar result to the computation type before performing - the reduction adjustment. - - * gcc.dg/vect/pr109473.c: New testcase. ---- /dev/null -+++ b/gcc/testsuite/gcc.dg/vect/pr109473.c -@@ -0,0 +1,16 @@ -+/* { dg-do compile } */ -+/* { dg-additional-options "-O" } */ -+ -+struct spa_buffer { -+ __UINT32_TYPE__ *metas; -+}; -+void do_port_use_buffers(struct spa_buffer **buffers, void *endptr, void *mem) -+{ -+ for (int i = 0; i < 128; i++) -+ { -+ for (int j = 0; j < 128; j++) -+ endptr = (void *)((__UINTPTR_TYPE__)endptr + buffers[i]->metas[j]); -+ if (endptr > mem) -+ return; -+ } -+} ---- a/gcc/tree-vect-loop.cc -+++ b/gcc/tree-vect-loop.cc -@@ -6297,9 +6297,12 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, - { - new_temp = scalar_results[0]; - gcc_assert (TREE_CODE (TREE_TYPE (adjustment_def)) != VECTOR_TYPE); -- adjustment_def = gimple_convert (&stmts, scalar_type, adjustment_def); -- new_temp = gimple_build (&stmts, code, scalar_type, -+ adjustment_def = gimple_convert (&stmts, TREE_TYPE (vectype), -+ adjustment_def); -+ new_temp = gimple_convert (&stmts, TREE_TYPE (vectype), new_temp); -+ new_temp = gimple_build (&stmts, code, TREE_TYPE (vectype), - new_temp, adjustment_def); -+ new_temp = gimple_convert (&stmts, scalar_type, new_temp); - } - - epilog_stmt = gimple_seq_last_stmt (stmts); --- -2.31.1 diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230409-r1.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230409-r1.ebuild deleted file mode 100644 index f476227f8198..000000000000 --- a/sys-devel/gcc/gcc-13.0.1_pre20230409-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="9" -PATCH_GCC_VER="13.1.0" -MUSL_VER="1" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -} diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230409-r2.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230409-r2.ebuild deleted file mode 100644 index 527b71d68608..000000000000 --- a/sys-devel/gcc/gcc-13.0.1_pre20230409-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="9" -PATCH_GCC_VER="13.1.0" -MUSL_VER="1" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply "${FILESDIR}"/${P}-PR109469-SLP-returns-twice.patch - eapply_user -} diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230409-r3.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230409-r3.ebuild deleted file mode 100644 index 073f68b644ac..000000000000 --- a/sys-devel/gcc/gcc-13.0.1_pre20230409-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="9" -PATCH_GCC_VER="13.1.0" -MUSL_VER="1" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply "${FILESDIR}"/${P}-PR109469-SLP-returns-twice.patch - eapply "${FILESDIR}"/${P}-PR109434-DSE-throw.patch - eapply_user -} diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230409-r4.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230409-r4.ebuild deleted file mode 100644 index f1ae324ca919..000000000000 --- a/sys-devel/gcc/gcc-13.0.1_pre20230409-r4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="9" -PATCH_GCC_VER="13.1.0" -MUSL_VER="1" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply "${FILESDIR}"/${P}-PR109469-SLP-returns-twice.patch - eapply "${FILESDIR}"/${P}-PR109434-DSE-throw.patch - eapply "${FILESDIR}"/${P}-PR109473-ICE-reduction-epilog.patch - eapply "${FILESDIR}"/${P}-PR109462-clang-LocalizationChecker-ranger-any-PHI.patch - eapply_user -} diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230409.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230409.ebuild deleted file mode 100644 index f476227f8198..000000000000 --- a/sys-devel/gcc/gcc-13.0.1_pre20230409.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="9" -PATCH_GCC_VER="13.1.0" -MUSL_VER="1" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -}
