struct same
{ typedef T2 type; };
diff --git a/SOURCES/gcc9-libstdc++-docs.patch b/SOURCES/gcc9-libstdc++-docs.patch
index 4656a79..ce07f32 100644
--- a/SOURCES/gcc9-libstdc++-docs.patch
+++ b/SOURCES/gcc9-libstdc++-docs.patch
@@ -4,7 +4,7 @@
FSF
-+ Release 9.1.1
++ Release 9.3.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 9.1.1 release,
++ for the 9.3.1 release,
+ online
for each GCC release
and
diff --git a/SOURCES/gcc9-pr90756.patch b/SOURCES/gcc9-pr90756.patch
deleted file mode 100644
index c43fb18..0000000
--- a/SOURCES/gcc9-pr90756.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-2019-07-04 Jakub Jelinek
-
- PR rtl-optimization/90756
- * explow.c (promote_ssa_mode): Always use TYPE_MODE, don't bypass it
- for VECTOR_TYPE_P.
-
---- gcc/explow.c
-+++ gcc/explow.c
-@@ -892,16 +892,7 @@ promote_ssa_mode (const_tree name, int *punsignedp)
-
- tree type = TREE_TYPE (name);
- int unsignedp = TYPE_UNSIGNED (type);
-- machine_mode mode = TYPE_MODE (type);
--
-- /* Bypass TYPE_MODE when it maps vector modes to BLKmode. */
-- if (mode == BLKmode)
-- {
-- gcc_assert (VECTOR_TYPE_P (type));
-- mode = type->type_common.mode;
-- }
--
-- machine_mode pmode = promote_mode (type, mode, &unsignedp);
-+ machine_mode pmode = promote_mode (type, TYPE_MODE (type), &unsignedp);
- if (punsignedp)
- *punsignedp = unsignedp;
-
---- /dev/null
-+++ gcc/testsuite/gcc.dg/pr90756.c
-@@ -0,0 +1,26 @@
-+/* PR rtl-optimization/90756 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -Wno-psabi" } */
-+/* { dg-additional-options "-mno-sse" { target ia32 } } */
-+
-+typedef float B __attribute__((vector_size(4 * sizeof (float))));
-+typedef unsigned long long C __attribute__((vector_size(4 * sizeof (long long))));
-+typedef short D __attribute__((vector_size(4 * sizeof (short))));
-+B z;
-+void foo (C);
-+C bar (D);
-+B baz ();
-+D qux (B);
-+
-+void
-+quux (int x)
-+{
-+ B n = z, b = z;
-+ while (1)
-+ switch (x)
-+ {
-+ case 0: n = baz (); /* FALLTHRU */
-+ case 1: { B o = n; n = b; b = o; } /* FALLTHRU */
-+ case 2: { D u = qux (b); C v = bar (u); foo (v); }
-+ }
-+}
diff --git a/SPECS/gcc.spec b/SPECS/gcc.spec
index 95ed60b..ae381af 100644
--- a/SPECS/gcc.spec
+++ b/SPECS/gcc.spec
@@ -2,9 +2,9 @@
%{?scl:%global __strip %%{_scl_root}/usr/bin/strip}
%{?scl:%global __objdump %%{_scl_root}/usr/bin/objdump}
%{?scl:%scl_package gcc}
-%global DATE 20190605
-%global SVNREV 271961
-%global gcc_version 9.1.1
+%global DATE 20200408
+%global gitrev 3535aa1f5e6c9b2de6a60d84460b8c5945a77ab4
+%global gcc_version 9.3.1
%global gcc_major 9
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
@@ -113,14 +113,16 @@
Summary: GCC version 9
Name: %{?scl_prefix}gcc
Version: %{gcc_version}
-Release: %{gcc_release}.6%{?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
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-9-branch@%%{SVNREV} gcc-%%{version}-%%{DATE}
-# tar cf - gcc-%%{version}-%%{DATE} | xz -9e > gcc-%%{version}-%%{DATE}.tar.xz
+# 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 %%{gitrev}
+# git --git-dir=gcc-dir.tmp/.git archive --prefix=%%{name}-%%{version}-%%{DATE}/ %%{gitrev} | xz -9e > %%{name}-%%{version}-%%{DATE}.tar.xz
+# rm -rf gcc-dir.tmp
Source0: gcc-%{version}-%{DATE}.tar.xz
Source1: ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
Source2: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
@@ -265,9 +267,6 @@ Provides: liblto_plugin.so.0
%if 0%{?rhel} == 6
ExclusiveArch: x86_64 %{ix86}
%endif
-%ifarch %{arm}
-%global oformat OUTPUT_FORMAT(elf32-littlearm)
-%endif
Patch0: gcc9-hack.patch
Patch1: gcc9-i386-libgomp.patch
@@ -281,7 +280,6 @@ Patch8: gcc9-foffload-default.patch
Patch9: gcc9-Wno-format-security.patch
Patch10: gcc9-rh1574936.patch
Patch11: gcc9-d-shared-libphobos.patch
-Patch12: gcc9-pr90756.patch
Patch1000: gcc9-libstdc++-compat.patch
Patch1001: gcc9-alt-compat-test.patch
@@ -309,10 +307,6 @@ Patch3014: 0014-Fill-in-missing-array-dimensions-using-the-lower-bou.patch
Patch3015: 0015-Allow-automatics-in-equivalence.patch
Patch3016: 0016-Suppress-warning-with-Wno-overwrite-recursive.patch
-
-# specific patches for .el7 armhfp build
-Patch10001: gcc9-dts-arm.patch
-
%if 0%{?rhel} > 7
%global nonsharedver 80
%else
@@ -324,9 +318,7 @@ Patch10001: gcc9-dts-arm.patch
%endif
%if 0%{?scl:1}
-%ifnarch %{arm}
%global _gnu %{nil}
-%endif
%else
%global _gnu 7E
%endif
@@ -336,10 +328,7 @@ Patch10001: gcc9-dts-arm.patch
%ifarch ppc ppc64p7
%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}%{?_gnu}
%endif
-%ifarch %{arm}
-%global gcc_target_platform armv7hl-%{_vendor}-%{_target_os}-gnueabi
-%endif
-%ifnarch sparcv9 ppc ppc64p7 %{arm}
+%ifnarch sparcv9 ppc ppc64p7
%global gcc_target_platform %{_target_platform}
%endif
@@ -639,7 +628,6 @@ This package contains Leak Sanitizer static runtime library.
%patch10 -p0 -b .rh1574936~
%endif
%patch11 -p0 -b .d-shared-libphobos~
-%patch12 -p0 -b .pr90756~
%patch1000 -p0 -b .libstdc++-compat~
%ifarch %{ix86} x86_64
@@ -681,10 +669,6 @@ cd ..
%patch3015 -p1 -b .fortran15~
%patch3016 -p1 -b .fortran16~
-%ifarch %{arm}
-%patch10001 -p1 -b .arm1
-%endif
-
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
%if 0%{?rhel} == 6
@@ -723,6 +707,14 @@ fi
# This test causes fork failures, because it spawns way too many threads
rm -f gcc/testsuite/go.test/test/chan/goroutines.go
+
+# These tests get stuck and don't timeout.
+%ifarch ppc64
+rm -f libgomp/testsuite/libgomp.c/target-32.c
+rm -f libgomp/testsuite/libgomp.c/target-33.c
+rm -f libgomp/testsuite/libgomp.c/target-34.c
+%endif
+
%build
# Undo the broken autoconf change in recent Fedora versions
@@ -913,10 +905,6 @@ CONFIGURE_OPTS="\
%ifarch mips64 mips64el
--with-arch=mips64r2 --with-abi=64 \
%endif
-%ifarch armv7hl
- --with-tune=cortex-a8 --with-arch=armv7-a \
- --with-float=hard --with-fpu=vfpv3-d16 --with-abi=aapcs-linux \
-%endif
%ifnarch sparc sparcv9 ppc
--build=%{gcc_target_platform} \
%endif
@@ -2566,6 +2554,25 @@ fi
%doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog
+* Wed Apr 8 2020 Marek Polacek 9.3.1-2
+- update from Fedora gcc-9.3.1-2
+
+* Tue Apr 7 2020 Marek Polacek 9.3.1-1.1
+- include the c++/93597 fix
+- remove several .hidden symbols from gcc9-libstdc++-compat
+
+* Wed Mar 18 2020 Marek Polacek 9.3.1-1
+- update from Fedora gcc-9.3.1-1 (#1812147)
+
+* Thu Feb 6 2020 Marek Polacek 9.2.1-3.8
+- remove a few *codecvt_utf8* symbols from gcc9-libstdc++-compat
+
+* Wed Jan 29 2020 Marek Polacek 9.2.1-3.7
+- gcc9-libstdc++-compat fix: move _ZSt19__throw_ios_failurePKc
+
+* Wed Jan 29 2020 Marek Polacek 9.2.1-3.6
+- update from Fedora gcc-9.2.1-3 (#1783475)
+
* Thu Nov 21 2019 Marek Polacek 9.1.1-2.6
- fix libgomp_nonshared.a symlink on ppc64