commit: 642d0c9db508ef1b128f52559fec2b6b692916b1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 21 06:05:43 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 21 06:18:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642d0c9d
sys-devel/gcc: drop old 15 snapshots Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 4 - .../gcc-15.0.1_pre20250406-compare-debug.patch | 88 --------- .../files/gcc-15.0.1_pre20250406-de-locale.patch | 216 --------------------- .../gcc/files/gcc-15.0.1_pre20250406-qt.patch | 77 -------- .../gcc-15.0.1_pre20250406-simplify-oops.patch | 81 -------- sys-devel/gcc/gcc-15.0.1_pre20250406-r2.ebuild | 59 ------ sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild | 55 ------ sys-devel/gcc/gcc-15.0.1_pre20250413.ebuild | 55 ------ sys-devel/gcc/gcc-15.0.1_pre20250418.ebuild | 56 ------ 9 files changed, 691 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 95ba38212c33..586a46d6cdc3 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -38,11 +38,7 @@ DIST gcc-14-20250419.tar.xz 88251960 BLAKE2B b9d8312ac8dd9dd82128ff872e379f3426b DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25 DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b52a00a951e9aa9a7a0a932b234b8f1a9603333a7ccf55859f4ef53dd4d8ad1fd5c1d2514b6e45fce5b86bb58622a0ecc SHA512 5a4d86d943e31fa068b5a784c0132bd83c23243dcb3cf972557a42e004469a415e1b3185f31b1bb36f916594d475f266a2fda031a414e4a15e0bbfe471269eee DIST gcc-14.2.0-patches-8.tar.xz 14540 BLAKE2B 09f66035343d4cab694b8ab382170f8e2d546ddffedf3477f26edbd6a798ddf94294f569c2661729d40088d590bc17a4eb651710d8d9f66f33703734a1a82b67 SHA512 7a9a2724ef8db3c57b033d90751192969c16e5eaa8f4777b7f16470222ff3a18771b461bd89feaad701e7f0d573b883b487981588129933c732fb76117728b86 -DIST gcc-15-20250406.tar.xz 91871244 BLAKE2B d9b4f8b382c5755f62e5f8b89deac74fdbe177e3961c205bba1d887c2157486908b85e80e0171e4d1ed6233d0cd8704af89850a3d2f6dcf0c6e703aa27b23fd9 SHA512 3a4b135833660107b6d3129570a24b3977e7da0f85296d663cfa8949eb8b2bd97237086535b1ff3eaf6423afcf799d18f21aaadc4fcc35835dca2f10cc154c7c -DIST gcc-15-20250413.tar.xz 91915660 BLAKE2B 80b2ad128d4bdbf3abf2295abfe452c1a1b1d831d73715e8d99d625dd0ec8e1293198fb0cbe7a04920eeb4ec88ce147d1120d297430cd6321e72b2c7948bcb08 SHA512 6b9b5bd62dd9624d8b49fe001f057cfa87a59c01064de108f4f24224849f19bb3fbfe4d7f70ee57cc7db88c41741cb5f49100402f88bbbe5fa1d07f50d4dc7aa DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de -DIST gcc-15.0.0-patches-53.tar.xz 27892 BLAKE2B 0c1455cae4aee49051fb5a8c31b8f82765da8ad9509ef17cb8c9f96d2c53a73fe1c8cfc0a2708e3bce0f8deb6f5e16807d8739bfd06cc6c08788331a719ded73 SHA512 c8f375f4de882ba99872f649f2cbbcc1b9f89d3dc9b355c1d11abfb6daf3ae7e89b82e002497215b641175d42d9f9a94749add2af2a5b6bcc1f3f5b41320df5b -DIST gcc-15.0.0-patches-54.tar.xz 20764 BLAKE2B fdd746b5243858d940e67f3dc11e085f370244c890e35b3f0b1b4af4f978ec98b5204b9874e9defd422f508262060e0b489ef85f5ba9b2296af371a7ed879bd5 SHA512 ecf38b4637c30ee7a0f74c73c55a3ba2d193d39e82e4bfe058494a5d125596bef547ea70ce52bf109cdec4aa31c3ed8c2b32ae52a9d9827be2b10e8fe0875e82 DIST gcc-15.0.0-patches-55.tar.xz 19028 BLAKE2B f01935ebcf814b34c0319e6b92cb3fc83a562990743d906fe171583ae583e4e6a8c31abba893b0a9b2e1665c3af62271e5ffdad0626a8585dd92e085c886c82e SHA512 1c46d0fb96dadf51a3aa48db97210eb4d9b92f6b9f4ac08af41009a385ef9ed064432a92b5e3163d9ca8bd9065cd5934b2792359ec8c09203e950e21d29119b4 DIST gcc-15.1.0-RC-20250418.tar.xz 98299960 BLAKE2B ba69804ff07c5ec4034c62827d00b03c3cd3b9af5e8dc0a7ad17edca5f82c0af1cfe4cbccea2fd42211cc29da4988006bb211bf84779054e480373778467f9f6 SHA512 38ff20b0c79ce9056905adb70af3566075bff1e700b0cbc64477a0c3374d254a4c6bb334e2360add33954701414238a8ec0a06f455a42906d5fc86995f2f5bd4 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-compare-debug.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250406-compare-debug.patch deleted file mode 100644 index 5fd89cd8e5e9..000000000000 --- a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-compare-debug.patch +++ /dev/null @@ -1,88 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=088887de7717a22b1503760e9b79dfbe22a0f428 - -From 088887de7717a22b1503760e9b79dfbe22a0f428 Mon Sep 17 00:00:00 2001 -From: Richard Biener <[email protected]> -Date: Wed, 9 Apr 2025 14:36:19 +0200 -Subject: [PATCH] rtl-optimization/119689 - compare-debug failure with LRA - -The previous change to fix LRA rematerialization broke compare-debug -for i586 bootstrap. Fixed by using prev_nonnote_nondebug_insn -instead of prev_nonnote_insn. - - PR rtl-optimization/119689 - PR rtl-optimization/115568 - * lra-remat.cc (create_cands): Use prev_nonnote_nondebug_insn - to check whether insn2 is directly before insn. - - * g++.target/i386/pr119689.C: New testcase. ---- - gcc/lra-remat.cc | 2 +- - gcc/testsuite/g++.target/i386/pr119689.C | 44 ++++++++++++++++++++++++ - 2 files changed, 45 insertions(+), 1 deletion(-) - create mode 100644 gcc/testsuite/g++.target/i386/pr119689.C - -diff --git a/gcc/lra-remat.cc b/gcc/lra-remat.cc -index 2f3afffcf5be..5f823193aa73 100644 ---- a/gcc/lra-remat.cc -+++ b/gcc/lra-remat.cc -@@ -460,7 +460,7 @@ create_cands (void) - && dst_regno >= FIRST_PSEUDO_REGISTER - && reg_renumber[dst_regno] < 0 - && BLOCK_FOR_INSN (insn2) == BLOCK_FOR_INSN (insn) -- && insn2 == prev_nonnote_insn (insn)) -+ && insn2 == prev_nonnote_nondebug_insn (insn)) - { - create_cand (insn2, regno_potential_cand[src_regno].nop, - dst_regno, insn); -diff --git a/gcc/testsuite/g++.target/i386/pr119689.C b/gcc/testsuite/g++.target/i386/pr119689.C -new file mode 100644 -index 000000000000..cdc6d2dade53 ---- /dev/null -+++ b/gcc/testsuite/g++.target/i386/pr119689.C -@@ -0,0 +1,44 @@ -+// { dg-do compile } -+// { dg-options "-O2 -fcompare-debug" } -+// { dg-additional-options "-march=i586 -mtune=generic" { target ia32 } } -+// { dg-additional-options "-fPIC" { target { fpic } } } -+ -+enum gimple_code { GIMPLE_ASSIGN, GIMPLE_RETURN }; -+bool is_gimple_call(); -+int m_sig, m_exp, sreal_new_exp; -+struct sreal { -+ sreal(long long sig) { -+ long long __trans_tmp_6 = sig >= 0 ? sig : -(unsigned long long)sig; -+ sig = __trans_tmp_6 <<= sreal_new_exp -= m_exp = __trans_tmp_6; -+ m_sig = sig; -+ } -+ void operator/(sreal); -+}; -+struct ipa_predicate { -+ ipa_predicate(bool = true); -+ void operator&=(ipa_predicate); -+ void operator&(ipa_predicate); -+}; -+void add_condition(); -+gimple_code eliminated_by_inlining_prob_code; -+static int eliminated_by_inlining_prob() { -+ switch (eliminated_by_inlining_prob_code) { -+ case GIMPLE_RETURN: -+ return 2; -+ case GIMPLE_ASSIGN: -+ return 1; -+ } -+ return 0; -+} -+void fp_expression_p() { -+ ipa_predicate bb_predicate; -+ for (;;) { -+ int prob = eliminated_by_inlining_prob(); -+ ipa_predicate sra_predicate; -+ sra_predicate &= add_condition; -+ if (is_gimple_call()) -+ sreal(prob) / 2; -+ if (prob != 2) -+ bb_predicate & sra_predicate; -+ } -+} --- -2.43.5 diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-de-locale.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250406-de-locale.patch deleted file mode 100644 index e0ccde38b94f..000000000000 --- a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-de-locale.patch +++ /dev/null @@ -1,216 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=1f32b87117b0e2ecc33b844d929d723de3fe8085 - -From 1f32b87117b0e2ecc33b844d929d723de3fe8085 Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek <[email protected]> -Date: Thu, 10 Apr 2025 18:39:52 +0200 -Subject: [PATCH] c++: Use G_ instead of _ around cp/errors.cc - gcc-internal-format strings [PR119684] - -These pp_printf/pp_verbatim format strings should be gcc-internal-format, -they use the pretty-print.cc format specifier handling rather than libc -*printf, but pp_printf/pp_verbatim are intentionally not handled through -exgettext because not everything done through them should be translated -(e.g. its use for dump files shouldn't be). -In addition, composing translatable messages from -"in requirements " and later on "with " might make it harder to be -translated. - -I've verified these strings (at least those which don't use format -specifiers added post GCC 4.3 which gettext doesn't handle) are properly -marked as gcc-internal-format in gcc.pot. The lack of that caused -ICEs on German translation of the "%s%s%sIn instantiation of %q#D:\n" -message because it contained too many %s. - -2025-04-10 Jakub Jelinek <[email protected]> - - PR translation/119684 - * error.cc (cp_print_error_function): Use G_ instead of _ for - pp_printf arguments. - (function_category): Use G_ instead of _. - (print_instantiation_full_context): Use G_ instead of _ in pp_verbatim - arguments. - (print_location): Likewise. - (print_instantiation_partial_context): Likewise. - (maybe_print_constexpr_context): Likewise. - (print_constrained_decl_info): Use G_() around pp_verbatim argument. - (print_concept_check_info): Likewise. - (print_constraint_context_head): Likewise. - (print_requires_expression_info): Likewise. Merge separate pp_verbatim - "in requirements " and "with " into one with conditional messages. ---- - gcc/cp/error.cc | 59 ++++++++++++++++++++++++------------------------- - 1 file changed, 29 insertions(+), 30 deletions(-) - -diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc -index ec7527e96d18..499eb1b15a85 100644 ---- a/gcc/cp/error.cc -+++ b/gcc/cp/error.cc -@@ -3788,18 +3788,18 @@ cp_print_error_function (diagnostic_text_output_format &text_output, - { - if (text_output.show_column_p () && s.column != 0) - pp_printf (pp, -- _(" inlined from %qD at %r%s:%d:%d%R"), -+ G_(" inlined from %qD at %r%s:%d:%d%R"), - fndecl, - "locus", s.file, s.line, s.column); - else - pp_printf (pp, -- _(" inlined from %qD at %r%s:%d%R"), -+ G_(" inlined from %qD at %r%s:%d%R"), - fndecl, - "locus", s.file, s.line); - - } - else -- pp_printf (pp, _(" inlined from %qD"), -+ pp_printf (pp, G_(" inlined from %qD"), - fndecl); - } - } -@@ -3825,22 +3825,22 @@ function_category (tree fn) - && DECL_FUNCTION_MEMBER_P (fn)) - { - if (DECL_STATIC_FUNCTION_P (fn)) -- return _("In static member function %qD"); -+ return G_("In static member function %qD"); - else if (DECL_COPY_CONSTRUCTOR_P (fn)) -- return _("In copy constructor %qD"); -+ return G_("In copy constructor %qD"); - else if (DECL_CONSTRUCTOR_P (fn)) -- return _("In constructor %qD"); -+ return G_("In constructor %qD"); - else if (DECL_DESTRUCTOR_P (fn)) -- return _("In destructor %qD"); -+ return G_("In destructor %qD"); - else if (LAMBDA_FUNCTION_P (fn)) -- return _("In lambda function"); -+ return G_("In lambda function"); - else if (DECL_XOBJ_MEMBER_FUNCTION_P (fn)) -- return _("In explicit object member function %qD"); -+ return G_("In explicit object member function %qD"); - else -- return _("In member function %qD"); -+ return G_("In member function %qD"); - } - else -- return _("In function %qD"); -+ return G_("In function %qD"); - } - - /* Disable warnings about missing quoting in GCC diagnostics for -@@ -3867,8 +3867,8 @@ print_instantiation_full_context (diagnostic_text_output_format &text_output) - char *indent = text_output.build_indent_prefix (true); - pp_verbatim (text_output.get_printer (), - p->list_p () -- ? _("%s%s%sIn substitution of %qS:\n") -- : _("%s%s%sIn instantiation of %q#D:\n"), -+ ? G_("%s%s%sIn substitution of %qS:\n") -+ : G_("%s%s%sIn instantiation of %q#D:\n"), - indent, - show_file ? LOCATION_FILE (location) : "", - show_file ? ": " : "", -@@ -3888,10 +3888,10 @@ print_location (diagnostic_text_output_format &text_output, - expanded_location xloc = expand_location (loc); - pretty_printer *const pp = text_output.get_printer (); - if (text_output.show_column_p ()) -- pp_verbatim (pp, _("%r%s:%d:%d:%R "), -+ pp_verbatim (pp, G_("%r%s:%d:%d:%R "), - "locus", xloc.file, xloc.line, xloc.column); - else -- pp_verbatim (pp, _("%r%s:%d:%R "), -+ pp_verbatim (pp, G_("%r%s:%d:%R "), - "locus", xloc.file, xloc.line); - } - -@@ -3984,22 +3984,22 @@ print_instantiation_partial_context_line (diagnostic_text_output_format &text_ou - if (t->list_p ()) - pp_verbatim (pp, - recursive_p -- ? _("recursively required by substitution of %qS\n") -- : _("required by substitution of %qS\n"), -+ ? G_("recursively required by substitution of %qS\n") -+ : G_("required by substitution of %qS\n"), - t->get_node ()); - else - pp_verbatim (pp, - recursive_p -- ? _("recursively required from %q#D\n") -- : _("required from %q#D\n"), -+ ? G_("recursively required from %q#D\n") -+ : G_("required from %q#D\n"), - t->get_node ()); - } - else - { - pp_verbatim (pp, - recursive_p -- ? _("recursively required from here\n") -- : _("required from here\n")); -+ ? G_("recursively required from here\n") -+ : G_("required from here\n")); - } - } - -@@ -4049,8 +4049,8 @@ print_instantiation_partial_context (diagnostic_text_output_format &text_output, - { - auto_context_line sentinel (text_output, loc); - pp_verbatim (text_output.get_printer (), -- _("[ skipping %d instantiation contexts," -- " use -ftemplate-backtrace-limit=0 to disable ]\n"), -+ G_("[ skipping %d instantiation contexts," -+ " use -ftemplate-backtrace-limit=0 to disable ]\n"), - skip); - do { - loc = t->locus; -@@ -4101,7 +4101,7 @@ maybe_print_constexpr_context (diagnostic_text_output_format &text_output) - pretty_printer *const pp = text_output.get_printer (); - auto_context_line sentinel (text_output, EXPR_LOCATION (t)); - pp_verbatim (pp, -- _("in %<constexpr%> expansion of %qs"), -+ G_("in %<constexpr%> expansion of %qs"), - s); - pp_newline (pp); - } -@@ -4114,7 +4114,7 @@ print_constrained_decl_info (diagnostic_text_output_format &text_output, - { - auto_context_line sentinel (text_output, DECL_SOURCE_LOCATION (decl)); - pretty_printer *const pp = text_output.get_printer (); -- pp_verbatim (pp, "required by the constraints of %q#D\n", decl); -+ pp_verbatim (pp, G_("required by the constraints of %q#D\n"), decl); - } - - static void -@@ -4129,7 +4129,7 @@ print_concept_check_info (diagnostic_text_output_format &text_output, - - cxx_pretty_printer *const pp - = (cxx_pretty_printer *)text_output.get_printer (); -- pp_verbatim (pp, "required for the satisfaction of %qE", expr); -+ pp_verbatim (pp, G_("required for the satisfaction of %qE"), expr); - if (map && map != error_mark_node) - { - tree subst_map = tsubst_parameter_mapping (map, args, tf_none, NULL_TREE); -@@ -4151,7 +4151,7 @@ print_constraint_context_head (diagnostic_text_output_format &text_output, - { - auto_context_line sentinel (text_output, input_location); - pretty_printer *const pp = text_output.get_printer (); -- pp_verbatim (pp, "required for constraint satisfaction\n"); -+ pp_verbatim (pp, G_("required for constraint satisfaction\n")); - return NULL_TREE; - } - if (DECL_P (src)) -@@ -4180,11 +4180,10 @@ print_requires_expression_info (diagnostic_text_output_format &text_output, - auto_context_line sentinel (text_output, cp_expr_loc_or_input_loc (expr)); - cxx_pretty_printer *const pp - = static_cast <cxx_pretty_printer *> (text_output.get_printer ()); -- pp_verbatim (pp, "in requirements "); - - tree parms = TREE_OPERAND (expr, 0); -- if (parms) -- pp_verbatim (pp, "with "); -+ pp_verbatim (pp, parms ? G_("in requirements with ") -+ : G_("in requirements ")); - while (parms) - { - pp_verbatim (pp, "%q#D", parms); --- -2.43.5 diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-qt.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250406-qt.patch deleted file mode 100644 index 86874faf6fdf..000000000000 --- a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-qt.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://inbox.sourceware.org/gcc-patches/[email protected]/ - -From 660e4bf9391692acb0bb18ba5eb38e689ae0a8a6 Mon Sep 17 00:00:00 2001 -Message-ID: <660e4bf9391692acb0bb18ba5eb38e689ae0a8a6.1744212391.git....@gentoo.org> -From: Patrick Palka <[email protected]> -Date: Wed, 9 Apr 2025 11:11:04 -0400 -Subject: [PATCH] c++: alias_ctad_tweaks ICE w/ inherited CTAD [PR119687] - -With inherited CTAD the set of guides may be a two-dimensional overload -set (i.e. OVERLOADs containing OVERLOADs) so alias_ctad_tweaks (which -also handles the inherited CTAD transformation) needs to use the 2D-aware -lkp_iterator instead of ovl_iterator. Actually, we might as well use -the more idiomatic lkp_range here. - - PR c++/119687 - -gcc/cp/ChangeLog: - - * pt.cc (alias_ctad_tweaks): Use lkp_range / lkp_iterator - instead of ovl_iterator. - -gcc/testsuite/ChangeLog: - -* g++.dg/cpp23/class-deduction-inherited8.C: New test. ---- - gcc/cp/pt.cc | 3 +-- - .../g++.dg/cpp23/class-deduction-inherited8.C | 21 +++++++++++++++++++ - 2 files changed, 22 insertions(+), 2 deletions(-) - create mode 100644 gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C - -diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc -index 0e120c4040ed..352a7f4ed316 100644 ---- a/gcc/cp/pt.cc -+++ b/gcc/cp/pt.cc -@@ -30937,9 +30937,8 @@ alias_ctad_tweaks (tree tmpl, tree uguides) - tree aguides = NULL_TREE; - tree atparms = INNERMOST_TEMPLATE_PARMS (fullatparms); - unsigned natparms = TREE_VEC_LENGTH (atparms); -- for (ovl_iterator iter (uguides); iter; ++iter) -+ for (tree f : lkp_range (uguides)) - { -- tree f = *iter; - tree in_decl = f; - location_t loc = DECL_SOURCE_LOCATION (f); - tree ret = TREE_TYPE (TREE_TYPE (f)); -diff --git a/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C b/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C -new file mode 100644 -index 000000000000..79fceadd9e1c ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C -@@ -0,0 +1,21 @@ -+// PR c++/119687 -+// { dg-do compile { target c++20 } } -+ -+template <typename> class QFlagsStorage{}; -+ -+template <typename Enum> struct QFlagsStorageHelper : QFlagsStorage<Enum> { -+ using QFlagsStorage<Enum>::QFlagsStorage; -+ -+public: -+ QFlagsStorageHelper(Enum); -+}; -+ -+template <typename Enum> struct QFlags : public QFlagsStorageHelper<Enum> { -+ using Base = QFlagsStorageHelper<Enum>; -+ using Base::Base; -+ QFlags(Enum); -+}; -+ -+void f(int flag) { -+ QFlags{int{}}; -+} - -base-commit: 334545194d9023fb9b2f72ee0dcde8af94930f25 --- -2.49.0 - diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-simplify-oops.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250406-simplify-oops.patch deleted file mode 100644 index abc7b6966cf7..000000000000 --- a/sys-devel/gcc/files/gcc-15.0.1_pre20250406-simplify-oops.patch +++ /dev/null @@ -1,81 +0,0 @@ -https://gcc.gnu.org/PR119672 -https://gcc.gnu.org/PR119713 -https://bugs.gentoo.org/953420 -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=04918a2d3f20b02ac3efad1096c33894d57789a0 - -From 04918a2d3f20b02ac3efad1096c33894d57789a0 Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek <[email protected]> -Date: Tue, 8 Apr 2025 15:14:58 +0200 -Subject: [PATCH] simplify-rtx: Fix up POPCOUNT optimization [PR119672] - -The gcc.dg/vect/pr113281-1.c test and many others ICE on riscv since -presumably the r15-9238 change which allowed more cases of vector modes -in simplify_const_relational_operation. -In the testcase it is EQ of -(popcount:SI (unspec:RVVMF32BI [ - (and:RVVMF32BI (const_vector:RVVMF32BI repeat [ - (const_int 1 [0x1]) - ]) - (reg:RVVMF32BI 147 [ mask__6.8_35 ])) - (reg:SI 143 [ _41 ]) - (const_int 0 [0]) - (reg:SI 66 vl) - (reg:SI 67 vtype) - ] UNSPEC_VPREDICATE)) -and -(const_int 0 [0]) -which it tries to fold as EQ comparison of -(unspec:RVVMF32BI [ - (and:RVVMF32BI (const_vector:RVVMF32BI repeat [ - (const_int 1 [0x1]) - ]) - (reg:RVVMF32BI 147 [ mask__6.8_35 ])) - (reg:SI 143 [ _41 ]) - (const_int 0 [0]) - (reg:SI 66 vl) - (reg:SI 67 vtype) - ] UNSPEC_VPREDICATE) -with -(const_int 0 [0]) -which ICEs because const0_rtx isn't a vector. -Fixed by using CONST0_RTX, so that we pass -(const_vector:RVVMF32BI repeat [ - (const_int 0 [0]) - ]) -instead. - -2025-04-08 Jakub Jelinek <[email protected]> - - PR rtl-optimization/119672 - * simplify-rtx.cc (simplify_context::simplify_relational_operation_1): - For POPCOUNT == 0 or != 0 optimizations use - CONST0_RTX (GET_MODE (XEXP (op0, 0))) rather than const0_rtx. ---- - gcc/simplify-rtx.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gcc/simplify-rtx.cc b/gcc/simplify-rtx.cc -index 6f969effdf99..88d31a71c05a 100644 ---- a/gcc/simplify-rtx.cc -+++ b/gcc/simplify-rtx.cc -@@ -6465,14 +6465,16 @@ simplify_context::simplify_relational_operation_1 (rtx_code code, - case LEU: - /* (eq (popcount x) (const_int 0)) -> (eq x (const_int 0)). */ - return simplify_gen_relational (EQ, mode, GET_MODE (XEXP (op0, 0)), -- XEXP (op0, 0), const0_rtx); -+ XEXP (op0, 0), -+ CONST0_RTX (GET_MODE (XEXP (op0, 0)))); - - case NE: - case GT: - case GTU: - /* (ne (popcount x) (const_int 0)) -> (ne x (const_int 0)). */ - return simplify_gen_relational (NE, mode, GET_MODE (XEXP (op0, 0)), -- XEXP (op0, 0), const0_rtx); -+ XEXP (op0, 0), -+ CONST0_RTX (GET_MODE (XEXP (op0, 0)))); - - default: - break; --- -2.43.5 diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250406-r2.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250406-r2.ebuild deleted file mode 100644 index db6335cc3065..000000000000 --- a/sys-devel/gcc/gcc-15.0.1_pre20250406-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintenance notes and explanations of GCC handling are on the wiki: -# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_HAS_TESTS=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="53" -MUSL_VER="2" -MUSL_GCC_VER="15.0.0" -PYTHON_COMPAT=( python3_{10..13} ) - -if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -if tc_is_live ; then - # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master -elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - # Don't keyword live ebuilds - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - :; -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}" -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}-simplify-oops.patch - eapply "${FILESDIR}"/${P}-compare-debug.patch - eapply "${FILESDIR}"/${P}-de-locale.patch - eapply "${FILESDIR}"/${P}-qt.patch - eapply_user -} diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild deleted file mode 100644 index fd941e7a420d..000000000000 --- a/sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintenance notes and explanations of GCC handling are on the wiki: -# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_HAS_TESTS=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="53" -MUSL_VER="2" -MUSL_GCC_VER="15.0.0" -PYTHON_COMPAT=( python3_{10..13} ) - -if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -if tc_is_live ; then - # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master -elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - # Don't keyword live ebuilds - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - :; -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}" -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-15.0.1_pre20250413.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250413.ebuild deleted file mode 100644 index ecf92065f264..000000000000 --- a/sys-devel/gcc/gcc-15.0.1_pre20250413.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintenance notes and explanations of GCC handling are on the wiki: -# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_HAS_TESTS=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="54" -MUSL_VER="2" -MUSL_GCC_VER="15.0.0" -PYTHON_COMPAT=( python3_{10..13} ) - -if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -if tc_is_live ; then - # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master -elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - # Don't keyword live ebuilds - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - :; -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}" -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-15.0.1_pre20250418.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250418.ebuild deleted file mode 100644 index 44538a987f52..000000000000 --- a/sys-devel/gcc/gcc-15.0.1_pre20250418.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintenance notes and explanations of GCC handling are on the wiki: -# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_HAS_TESTS=1 -TOOLCHAIN_GCC_RC=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="55" -MUSL_VER="2" -MUSL_GCC_VER="15.0.0" -PYTHON_COMPAT=( python3_{10..13} ) - -if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -if tc_is_live ; then - # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master -elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - # Don't keyword live ebuilds - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - :; -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}" -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 -}
