From 18b4328a87f9bc75590883e36d6bb7b767fde415cc1541e8dd8a297093fb7889 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Tue, 11 May 2021 08:44:13 +0000
Subject: [PATCH 1/2] Accepting request 890709 from home:gmbr3:Active

- Change bfd-plugins to be installed in %_libdir

OBS-URL: https://build.opensuse.org/request/show/890709
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=107
---
 gcc.changes | 5 +++++
 gcc.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gcc.changes b/gcc.changes
index 730d67e..5d5cb8f 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  5 12:48:07 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Change bfd-plugins to be installed in %_libdir
+
 -------------------------------------------------------------------
 Thu Apr 29 08:45:13 UTC 2021 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc.spec b/gcc.spec
index b483207..959a020 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -478,8 +478,8 @@ ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
 ln -sf g++-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/c++.1.gz
 ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 # Install the LTO linker plugin so it is auto-loaded by BFD
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins
-ln -s `gcc-%{gcc_suffix} -print-file-name=liblto_plugin.so` $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins/liblto_plugin.so
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/bfd-plugins
+ln -s `gcc-%{gcc_suffix} -print-file-name=liblto_plugin.so` $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/liblto_plugin.so
 
 dir=`gcc-%{gcc_suffix} -print-prog-name=cc1`
 dir=${dir%/cc1}
@@ -513,8 +513,8 @@ fi
 %{_prefix}/bin/gcc-ar
 %{_prefix}/bin/gcc-nm
 %{_prefix}/bin/gcc-ranlib
-%dir %{_prefix}/lib/bfd-plugins
-%{_prefix}/lib/bfd-plugins/liblto_plugin.so
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/liblto_plugin.so
 %doc %{_mandir}/man1/gcc.1.gz
 %doc %{_mandir}/man1/cc.1.gz
 %doc %{_mandir}/man1/gcov.1.gz

From 00bb6960cfd28844d2c393bf40f54e9feae6fe310f3ddd8326885b1e7d8fb24b Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Fri, 9 Jul 2021 07:44:17 +0000
Subject: [PATCH 2/2] - With gcc-PIE add -pie even when -fPIC is specified but
 we are   not linking a shared library.  [boo#1185348]

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=109
---
 gcc.changes | 6 ++++++
 gcc.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gcc.changes b/gcc.changes
index 5d5cb8f..ce594f6 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  9 07:41:14 UTC 2021 - Richard Biener <rguenther@suse.com>
+
+- With gcc-PIE add -pie even when -fPIC is specified but we are
+  not linking a shared library.  [boo#1185348]
+
 -------------------------------------------------------------------
 Wed May  5 12:48:07 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/gcc.spec b/gcc.spec
index 959a020..80d1bec 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:
-%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE -pie}
+%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
 EOF
 
 %post -n gcc-go