From 196134fb45604067ccbe5c5262dae98bbde6e1f4 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 18 Jan 2021 08:09:14 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gcc.git#dd22b2a0a26b8d079b8f9e71476191ca4056f5fc
---
 .gitignore               |  1 +
 gcc.spec                 | 23 ++++++++++++++++++-----
 gcc11-i386-libgomp.patch | 11 -----------
 sources                  |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 gcc11-i386-libgomp.patch

diff --git a/.gitignore b/.gitignore
index 48a9c85..66ca0a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /gcc-11.0.0-20201223.tar.xz
 /gcc-11.0.0-20210109.tar.xz
 /gcc-11.0.0-20210113.tar.xz
+/gcc-11.0.0-20210116.tar.xz
diff --git a/gcc.spec b/gcc.spec
index 3f4f4d3..28f89b2 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,5 +1,5 @@
-%global DATE 20210113
-%global gitrev 12a2ec94f0612806441cdf5a9aab09ecf9b23deb
+%global DATE 20210116
+%global gitrev d42629234e8a859ed1be99bf5e06bce1a4e3fb0c
 %global gcc_version 11.0.0
 %global gcc_major 11
 # Note, gcc_release must be integer, if you want to add suffixes to
@@ -119,7 +119,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.13%{?dist}
+Release: %{gcc_release}.14%{?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
@@ -261,7 +261,6 @@ Provides: bundled(libiberty)
 Provides: gcc(major) = %{gcc_major}
 
 Patch0: gcc11-hack.patch
-Patch1: gcc11-i386-libgomp.patch
 Patch2: gcc11-sparc-config-detection.patch
 Patch3: gcc11-libgomp-omp_h-multilib.patch
 Patch4: gcc11-libtool-no-rpath.patch
@@ -767,7 +766,6 @@ to NVidia PTX capable devices if available.
 %prep
 %setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2
 %patch0 -p0 -b .hack~
-%patch1 -p0 -b .i386-libgomp~
 %patch2 -p0 -b .sparc-config-detection~
 %patch3 -p0 -b .libgomp-omp_h-multilib~
 %patch4 -p0 -b .libtool-no-rpath~
@@ -3069,6 +3067,21 @@ end
 %endif
 
 %changelog
+* Sat Jan 16 2021 Jakub Jelinek <jakub@redhat.com> 11.0.0-0.14
+- update from trunk
+  - PRs ada/98595, analyzer/98679, bootstrap/98696, c++/63707, c++/98231,
+	c++/98372, c++/98538, c++/98591, c++/98626, c++/98642, fortran/98661,
+	ipa/98652, jit/98586, libgomp/65099, libstdc++/98466, libstdc++/98471,
+	preprocessor/95253, target/70454, target/71233, target/88836,
+	target/95905, target/96938, target/98667, target/98671, target/98676,
+	testsuite/96098, testsuite/96147, tree-optimization/92645,
+	tree-optimization/96376, tree-optimization/96669,
+	tree-optimization/96681, tree-optimization/96688,
+	tree-optimization/96691, tree-optimization/98455,
+	tree-optimization/98597, tree-optimization/98640,
+	tree-optimization/98674, tree-optimization/98685
+  - fix up pmovzx permutation SSE4.1 patterns (#1916240, PR target/98670)
+
 * Wed Jan 13 2021 Jakub Jelinek <jakub@redhat.com> 11.0.0-0.13
 - update from trunk
   - PRs analyzer/98628, c++/97284, c++/98481, c++/98556, c++/98611, c++/98620,
diff --git a/gcc11-i386-libgomp.patch b/gcc11-i386-libgomp.patch
deleted file mode 100644
index 520561e..0000000
--- a/gcc11-i386-libgomp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgomp/configure.tgt.jj	2008-01-10 20:53:48.000000000 +0100
-+++ libgomp/configure.tgt	2008-03-27 12:44:51.000000000 +0100
-@@ -67,7 +67,7 @@ if test $enable_linux_futex = yes; then
- 	    ;;
- 	  *)
- 	    if test -z "$with_arch"; then
--	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
-+	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
- 	    fi
- 	esac
- 	;;
diff --git a/sources b/sources
index 7a5fa14..6d46e14 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gcc-11.0.0-20210113.tar.xz) = f11fbefb813368de29eb1368219938ce3f77b96f543b18d2ce14be113f25c8eaa46a450f1b88ed5752cf8180ed8881273f9ac5771bf1274d11e10d1fa16131e6
+SHA512 (gcc-11.0.0-20210116.tar.xz) = befda0f25ccc682205d2ed6a50edba3da059042fa0a25e3a435011765c8f61e895eef52ebeed7de0bf61f97ee8308645779f3dc55675cabe51acc6ea74c517b0
 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c
 SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7