gentoo auto-resync : 08:08:2023 - 09:27:00

3 files changed, 108 insertions, 1 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d23f551b6600..147022806538 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,5 @@
 AUX gcc-13-fix-cross-fixincludes.patch 792 BLAKE2B f16dcfee5760380931642520bf7ae939a22131183dec4f9515cabeabaa2eafbc339d4f8bdc0605bda45d840876cb8720264c4612d99510b4d7a2e4132db2403e SHA512 d65061e07c5f3089a9d39edafed94c39082dbb254cfebb386fa2fce5374e54e3e1e15a84f0de96adbe1c5ebfc33a5dad10ecbd3db851f852ec1a7521b8940fc5
+AUX gcc-14.0.0_pre20230806-fix-bootstrap.patch 4747 BLAKE2B a8ece1f797ff858be11a1c77583535e75239ee46658a530b1c3c10b2655ae564b8a9fcb3584ea8695c50eb6c3d373497c814a7d06ea1495def2a7bdf2810a181 SHA512 c7a35a9193eabf370bb7f00adabb4854627473ad409fad368962c0349a0946e9ac87b42bc0cab90f66607a5fcc28f16a7b27168787752479882ce4ac133b1266
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
@@ -61,7 +62,7 @@ EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01f
 EBUILD gcc-14.0.0.9999.ebuild 1568 BLAKE2B 02ff0ed9ee64898714a411d4d6dce9ab4ed30ec1f8dce58036da4cfdd033281868c82b1a9e6da669898e405194f84be3db34cbf7a8b0144d2049558f30370b90 SHA512 5aa6f2841a026a8b021f3fd0a6ff47f11f1a7039454cb95a8af148f247792c90d08d254b16c1369e0aabf83da53add611594632a951fa075c06daee837eb27c9
 EBUILD gcc-14.0.0_pre20230723.ebuild 1595 BLAKE2B 6986a9323f7bbc6c814b68b40333c6279ba7f1b1733695b12568e59390b991441b03523b015fdf67e8b0249fdf874e36a46993d2357d9b24b3a97b79ca4bf8fd SHA512 c2cc081c84cd0846da49b81e7835e8b35365d51c4a014edb765a410e4a7b528928f32fedbca2e40aa0d2da80ccebaadada67c1b746a70b6e7910d71503cc6097
 EBUILD gcc-14.0.0_pre20230730.ebuild 1595 BLAKE2B 6986a9323f7bbc6c814b68b40333c6279ba7f1b1733695b12568e59390b991441b03523b015fdf67e8b0249fdf874e36a46993d2357d9b24b3a97b79ca4bf8fd SHA512 c2cc081c84cd0846da49b81e7835e8b35365d51c4a014edb765a410e4a7b528928f32fedbca2e40aa0d2da80ccebaadada67c1b746a70b6e7910d71503cc6097
-EBUILD gcc-14.0.0_pre20230806.ebuild 1595 BLAKE2B 6986a9323f7bbc6c814b68b40333c6279ba7f1b1733695b12568e59390b991441b03523b015fdf67e8b0249fdf874e36a46993d2357d9b24b3a97b79ca4bf8fd SHA512 c2cc081c84cd0846da49b81e7835e8b35365d51c4a014edb765a410e4a7b528928f32fedbca2e40aa0d2da80ccebaadada67c1b746a70b6e7910d71503cc6097
+EBUILD gcc-14.0.0_pre20230806-r1.ebuild 1642 BLAKE2B 9c663e76e2d7a62d915a9f1b1ce0cc1301a3a582c8314b1b19c6b67f5cc72ad7ec09ade74ef51807e7513d6088374b37bae2b339b490947da6e0deaefd6ff695 SHA512 f792bd5b4a6085af4f537c62d320adf7b0a7ffc71f546fb17ba448c763ff74127dcb5ace37fd3993cf92401a288769bc5675efc5786cf310e64bedd375ec2007
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 1206 BLAKE2B 262931215488db54cab2141549f997a48e22d0a917917eb670d41d5b155c7685e92eb1bc3843d2eca47dd15a450199aea5d99777d2870ff09b1a79ac8a63bcb0 SHA512 3737a70e70e53a581280ff1449d7d92bb9ffba0919b618ea43d4747e09b2803795a05c07c0e3a2ec8982f8d5594be58f9ac549d329b18dc236ad5159e4a47132
 MISC metadata.xml 5254 BLAKE2B b64569d62dd67c2f2dab441bb2c4a65bcd61b4c9d8ad7543e8f91c583501d72ed1474abf785e68c48de298d8391de3d94b9b4020086b2b0fa9cc477114a92e9e SHA512 f1307b7865dc4c2c843b5f498196bf5710e45e3292181b43687ebe85b5e9b26203c9c83ee7872efe2cd93595eca430de91e3a5fd6900f0f62c875308ccbb0303
diff --git a/sys-devel/gcc/files/gcc-14.0.0_pre20230806-fix-bootstrap.patch b/sys-devel/gcc/files/gcc-14.0.0_pre20230806-fix-bootstrap.patch
new file mode 100644
index 000000000000..5d5747312b69
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-14.0.0_pre20230806-fix-bootstrap.patch
@@ -0,0 +1,105 @@
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=af6cfd7b663909688c6ca55b6e9f859cdde4310f
+https://gcc.gnu.org/PR110926
+
+From af6cfd7b663909688c6ca55b6e9f859cdde4310f Mon Sep 17 00:00:00 2001
+From: liuhongt <hongtao.liu@intel.com>
+Date: Mon, 7 Aug 2023 11:10:52 +0800
+Subject: [PATCH] Fix ICE in rtl check when bootstrap.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+/var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/libgfortran/generated/matmul_i1.c: In function âmatmul_i1_avx512fâ:
+/var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/libgfortran/generated/matmul_i1.c:1781:1: internal compiler error: RTL check: expected elt 0 type 'i' or 'n', have 'w' (rtx const_int) in vpternlog_redundant_operand_mask, at config/i386/i386.cc:19460
+ 1781 | }
+      | ^
+0x5559de26dc2d rtl_check_failed_type2(rtx_def const*, int, int, int, char const*, int, char const*)
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/rtl.cc:761
+0x5559de340bfe vpternlog_redundant_operand_mask(rtx_def**)
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/config/i386/i386.cc:19460
+0x5559dfec67a6 split_44
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/config/i386/sse.md:12730
+0x5559dfec67a6 split_63
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/config/i386/sse.md:28428
+0x5559deb8a682 try_split(rtx_def*, rtx_insn*, int)
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/emit-rtl.cc:3800
+0x5559deb8adf2 try_split(rtx_def*, rtx_insn*, int)
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/emit-rtl.cc:3972
+0x5559def69194 split_insn
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/recog.cc:3385
+0x5559def70c57 split_all_insns()
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/recog.cc:3489
+0x5559def70d0c execute
+        /var/tmp/portage/sys-devel/gcc-14.0.0_pre20230806/work/gcc-14-20230806/gcc/recog.cc:4413
+
+Use INTVAL (imm_op) instead of XINT (imm_op, 0).
+
+gcc/ChangeLog:
+
+	PR target/110926
+	* config/i386/i386-protos.h
+	(vpternlog_redundant_operand_mask): Adjust parameter type.
+	* config/i386/i386.cc (vpternlog_redundant_operand_mask): Use
+	INTVAL instead of XINT, also adjust parameter type from rtx*
+	to rtx since the function only needs operands[4] in vpternlog
+	pattern.
+	(substitute_vpternlog_operands): Pass operands[4] instead of
+	operands to vpternlog_redundant_operand_mask.
+	* config/i386/sse.md: Ditto.
+--- a/gcc/config/i386/i386-protos.h
++++ b/gcc/config/i386/i386-protos.h
+@@ -70,7 +70,7 @@ extern machine_mode ix86_cc_mode (enum rtx_code, rtx, rtx);
+ extern int avx_vpermilp_parallel (rtx par, machine_mode mode);
+ extern int avx_vperm2f128_parallel (rtx par, machine_mode mode);
+ 
+-extern int vpternlog_redundant_operand_mask (rtx[]);
++extern int vpternlog_redundant_operand_mask (rtx);
+ extern void substitute_vpternlog_operands (rtx[]);
+ 
+ extern bool ix86_expand_strlen (rtx, rtx, rtx, rtx);
+--- a/gcc/config/i386/i386.cc
++++ b/gcc/config/i386/i386.cc
+@@ -19454,10 +19454,10 @@ avx_vperm2f128_parallel (rtx par, machine_mode mode)
+ /* Return a mask of VPTERNLOG operands that do not affect output.  */
+ 
+ int
+-vpternlog_redundant_operand_mask (rtx *operands)
++vpternlog_redundant_operand_mask (rtx pternlog_imm)
+ {
+   int mask = 0;
+-  int imm8 = XINT (operands[4], 0);
++  int imm8 = INTVAL (pternlog_imm);
+ 
+   if (((imm8 >> 4) & 0x0F) == (imm8 & 0x0F))
+     mask |= 1;
+@@ -19475,7 +19475,7 @@ vpternlog_redundant_operand_mask (rtx *operands)
+ void
+ substitute_vpternlog_operands (rtx *operands)
+ {
+-  int mask = vpternlog_redundant_operand_mask (operands);
++  int mask = vpternlog_redundant_operand_mask (operands[4]);
+ 
+   if (mask & 1) /* The first operand is redundant.  */
+     operands[1] = operands[2];
+--- a/gcc/config/i386/sse.md
++++ b/gcc/config/i386/sse.md
+@@ -12751,7 +12751,7 @@
+ 	   (match_operand:V 3 "memory_operand")
+ 	   (match_operand:SI 4 "const_0_to_255_operand")]
+ 	  UNSPEC_VTERNLOG))]
+-  "!reload_completed && vpternlog_redundant_operand_mask (operands) == 3"
++  "!reload_completed && vpternlog_redundant_operand_mask (operands[4]) == 3"
+   [(set (match_dup 0)
+ 	(match_dup 3))
+    (set (match_dup 0)
+@@ -12772,7 +12772,7 @@
+ 	   (match_operand:V 3 "nonimmediate_operand")
+ 	   (match_operand:SI 4 "const_0_to_255_operand")]
+ 	  UNSPEC_VTERNLOG))]
+-  "!reload_completed && vpternlog_redundant_operand_mask (operands) != 0"
++  "!reload_completed && vpternlog_redundant_operand_mask (operands[4]) != 0"
+   [(set (match_dup 0)
+ 	(unspec:V
+ 	  [(match_dup 1)
+-- 
+2.39.3
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20230806.ebuild b/sys-devel/gcc/gcc-14.0.0_pre20230806-r1.ebuild
index 59534d9e96dd..3c3d844369c0 100644
--- a/sys-devel/gcc/gcc-14.0.0_pre20230806.ebuild
+++ b/sys-devel/gcc/gcc-14.0.0_pre20230806-r1.ebuild
@@ -60,5 +60,6 @@ src_prepare() {
 
 	toolchain_src_prepare
 
+	eapply "${FILESDIR}"/${P}-fix-bootstrap.patch
 	eapply_user
 }