From ca788bfdffb0f4bd7b210e848f2007cec8829de9 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek
Date: Wed, 26 Apr 2023 10:58:06 +0200
Subject: [PATCH] 13.1.1-1
---
.gitignore | 1 +
gcc.spec | 17 ++++++++------
gcc13-libstdc++-docs.patch | 4 ++--
gcc13-pr109583.patch | 48 --------------------------------------
sources | 2 +-
update-gcc.sh | 2 +-
6 files changed, 15 insertions(+), 59 deletions(-)
delete mode 100644 gcc13-pr109583.patch
diff --git a/.gitignore b/.gitignore
index 3beff17..d54fd05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@
/gcc-13.0.1-20230418.tar.xz
/gcc-13.0.1-20230419.tar.xz
/gcc-13.0.1-20230421.tar.xz
+/gcc-13.1.1-20230426.tar.xz
diff --git a/gcc.spec b/gcc.spec
index 8436907..f562329 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,10 +1,10 @@
-%global DATE 20230421
-%global gitrev 4be14f2db84d42993908d17f2b66a655b5bc050d
-%global gcc_version 13.0.1
+%global DATE 20230426
+%global gitrev 99aa4c60d1f6a96b09f65b669d44bbab206f0a75
+%global gcc_version 13.1.1
%global gcc_major 13
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 0
+%global gcc_release 1
%global nvptx_tools_gitrev 93e00909ceb9cbbc104f0fcba56c0361ffb3ca4b
%global newlib_cygwin_gitrev 9e09d6ed83cce4777a5950412647ccc603040409
%global _unpackaged_files_terminate_build 0
@@ -136,7 +136,7 @@
Summary: Various compilers (C, C++, Objective-C, ...)
Name: gcc
Version: %{gcc_version}
-Release: %{gcc_release}.16%{?dist}
+Release: %{gcc_release}%{?dist}
# libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
# GCC Runtime Exception.
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -286,7 +286,6 @@ Patch8: gcc13-no-add-needed.patch
Patch9: gcc13-Wno-format-security.patch
Patch10: gcc13-rh1574936.patch
Patch11: gcc13-d-shared-libphobos.patch
-Patch12: gcc13-pr109583.patch
Patch50: isl-rh2155127.patch
@@ -863,7 +862,6 @@ so that there cannot be any synchronization problems.
%patch -P10 -p0 -b .rh1574936~
%endif
%patch -P11 -p0 -b .d-shared-libphobos~
-%patch -P12 -p0 -b .pr109583~
%patch -P50 -p0 -b .rh2155127~
touch -r isl-0.24/m4/ax_prog_cxx_for_build.m4 isl-0.24/m4/ax_prog_cc_for_build.m4
@@ -3461,6 +3459,11 @@ end
%endif
%changelog
+* Wed Apr 26 2023 Jakub Jelinek 13.1.1-1
+- update from releases/gcc-13 branch
+ - GCC 13.1 release
+ - PRs c/107041, target/109566
+
* Fri Apr 21 2023 Jakub Jelinek 13.0.1-0.16
- update from trunk and releases/gcc-13 branch
- GCC 13.1-rc3
diff --git a/gcc13-libstdc++-docs.patch b/gcc13-libstdc++-docs.patch
index 5a2fe27..6dffae6 100644
--- a/gcc13-libstdc++-docs.patch
+++ b/gcc13-libstdc++-docs.patch
@@ -4,7 +4,7 @@
FSF
-+ Release 13.0.1
++ Release 13.1.1
+
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation
@@ -17,7 +17,7 @@
- The API documentation, rendered into HTML, can be viewed online
+ The API documentation, rendered into HTML, can be viewed locally
-+ for the 13.0.1 release,
++ for the 13.1.1 release,
+ online
for each GCC release
and
diff --git a/gcc13-pr109583.patch b/gcc13-pr109583.patch
deleted file mode 100644
index 1eb3708..0000000
--- a/gcc13-pr109583.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-2023-04-21 Jakub Jelinek
-
- PR tree-optimization/109583
- * match.pd (fneg/fadd simplify): Don't call related_vector_mode
- if vec_mode is not VECTOR_MODE_P.
-
- * gcc.dg/pr109583.c: New test.
-
---- gcc/match.pd.jj 2023-04-18 11:01:38.867871375 +0200
-+++ gcc/match.pd 2023-04-21 13:26:01.250166206 +0200
-@@ -8095,7 +8095,8 @@ and,
- poly_uint64 wide_nunits;
- scalar_mode inner_mode = GET_MODE_INNER (vec_mode);
- }
-- (if (sel.series_p (0, 2, 0, 2)
-+ (if (VECTOR_MODE_P (vec_mode)
-+ && sel.series_p (0, 2, 0, 2)
- && sel.series_p (1, 2, nelts + 1, 2)
- && GET_MODE_2XWIDER_MODE (inner_mode).exists (&wide_elt_mode)
- && multiple_p (GET_MODE_NUNITS (vec_mode), 2, &wide_nunits)
---- gcc/testsuite/gcc.dg/pr109583.c.jj 2023-04-21 13:28:36.462911138 +0200
-+++ gcc/testsuite/gcc.dg/pr109583.c 2023-04-21 13:28:06.746342736 +0200
-@@ -0,0 +1,25 @@
-+/* PR tree-optimization/109583 */
-+/* { dg-do compile } */
-+/* { dg-options "-O1 -Wno-psabi" } */
-+/* { dg-additional-options "-mno-avx" { target i?86-*-* x86_64-*-* } } */
-+
-+typedef float v8sf __attribute__((vector_size (8 * sizeof (float))));
-+typedef int v8si __attribute__((vector_size (8 * sizeof (int))));
-+
-+#if __SIZEOF_INT__ == __SIZEOF_FLOAT__
-+v8sf
-+foo (v8sf x, v8sf y)
-+{
-+ v8sf a = x - y;
-+ v8sf b = x + y;
-+ return __builtin_shuffle (a, b, (v8si) { 0, 9, 2, 11, 4, 13, 6, 15 });
-+}
-+
-+v8sf
-+bar (v8sf x, v8sf y)
-+{
-+ v8sf a = x + y;
-+ v8sf b = x - y;
-+ return __builtin_shuffle (a, b, (v8si) { 0, 9, 2, 11, 4, 13, 6, 15 });
-+}
-+#endif
diff --git a/sources b/sources
index 57ed1a1..ffb1707 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (gcc-13.0.1-20230421.tar.xz) = 75b36b5018e014e9c187f86de4333494c05760b0f1ddf02b46e969f477202d7998aadbbb6b3ee1f0a1ed950e764e4ad706f7040ae2845339c56d671fd812e148
+SHA512 (gcc-13.1.1-20230426.tar.xz) = 7a588d7720c67fce57ab483168684195810a168f3234667151d0b76638d15ae50d8f9de0c9f2c2aaa1345e45c46577575b717dbb73f8cccce79932c37cacac5a
SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
SHA512 (newlib-cygwin-9e09d6ed83cce4777a5950412647ccc603040409.tar.xz) = bef3fa04f7b1a915fc1356ebed114698b5cc835e9fa04b0becff05a9efc76c59fb376482990873d222d7acdcfee3c4f30f5a4cb7f3be1f291f1fa5f1c7a9d983
SHA512 (nvptx-tools-93e00909ceb9cbbc104f0fcba56c0361ffb3ca4b.tar.xz) = c719fad8689b2b6f3c888d0308604ddef884037d71ec3e755c68052d30075a181c29358fda516833ace437921b17602b147be7886317be94ec9736faa8cb52be
diff --git a/update-gcc.sh b/update-gcc.sh
index b6c0315..0c357f3 100755
--- a/update-gcc.sh
+++ b/update-gcc.sh
@@ -3,5 +3,5 @@
git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp
git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin $1
d=`date --iso | sed 's/-//g'`
-git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-13.0.1-$d/ $1 | xz -9e > gcc-13.0.1-$d.tar.xz
+git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-13.1.1-$d/ $1 | xz -9e > gcc-13.1.1-$d.tar.xz
rm -rf gcc-dir.tmp