From e8b3801d3dfdb8014d48913abe168e57ab857e63ddc27298dc1ea700eed75af3 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Fri, 30 Apr 2021 06:33:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=106

---
 gcc.changes | 6 ------
 gcc.spec    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gcc.changes b/gcc.changes
index fbd90bf..730d67e 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -4,12 +4,6 @@ Thu Apr 29 08:45:13 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Switch gcc to default 11.
 - Adjust liblto_plugin.so naming for GCC 11.
 
--------------------------------------------------------------------
-Thu Apr 29 08:36:04 UTC 2021 - Richard Biener <rguenther@suse.com>
-
-- Adjust specs for gcc-PIE to use -pie at link-time even when
-  -fPIE is set (but not -shared and friends).  [bsc#1185348]
-
 -------------------------------------------------------------------
 Thu Nov 12 11:42:44 UTC 2020 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc.spec b/gcc.spec
index 40b2573..b483207 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -486,7 +486,7 @@ dir=${dir%/cc1}
 mkdir -p $RPM_BUILD_ROOT/$dir
 cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
 *default_spec:
-%%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
+%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE -pie}
 EOF
 
 %post -n gcc-go