From 0a42a3627d70a5d7aa9a67a9f8a31b750ac62b51 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 10 Aug 2021 08:12:33 -0400
Subject: [PATCH] import compat-sap-c++-11-11.1.1-6.el8_4

---
 SOURCES/gcc11-power10.patch  | 17 +++++++++++++++++
 SPECS/compat-sap-c++-11.spec | 13 +++----------
 2 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 SOURCES/gcc11-power10.patch

diff --git a/SOURCES/gcc11-power10.patch b/SOURCES/gcc11-power10.patch
new file mode 100644
index 0000000..53c73a5
--- /dev/null
+++ b/SOURCES/gcc11-power10.patch
@@ -0,0 +1,17 @@
+--- libgcc/config.host.mp	2021-07-20 21:04:59.361775994 -0400
++++ libgcc/config.host	2021-07-20 21:26:49.054308012 -0400
+@@ -1220,14 +1220,6 @@ powerpc*-*-linux*)
+ 		tmake_file="${tmake_file} rs6000/t-float128"
+ 	fi
+ 
+-	if test $libgcc_cv_powerpc_float128_hw = yes; then
+-		tmake_file="${tmake_file} rs6000/t-float128-hw"
+-	fi
+-
+-	if test $libgcc_cv_powerpc_3_1_float128_hw = yes; then
+-		tmake_file="${tmake_file} rs6000/t-float128-p10-hw"
+-	fi
+-
+ 	extra_parts="$extra_parts ecrti.o ecrtn.o ncrti.o ncrtn.o"
+ 	md_unwind_header=rs6000/linux-unwind.h
+ 	;;
diff --git a/SPECS/compat-sap-c++-11.spec b/SPECS/compat-sap-c++-11.spec
index 579d084..0f836eb 100644
--- a/SPECS/compat-sap-c++-11.spec
+++ b/SPECS/compat-sap-c++-11.spec
@@ -119,11 +119,6 @@ BuildRequires: mpfr-devel >= 3.1.0
 BuildRequires: libmpc-devel >= 0.8.1
 %endif
 
-%ifarch ppc64le
-BuildRequires: gcc-toolset-11-runtime gcc-toolset-11-binutils
-BuildRequires: gcc-toolset-11-gcc gcc-toolset-11-gcc-c++
-%endif
-
 AutoReq: true
 AutoProv: false
 # Don't provide this for compat-sap-c++ (#1491573).
@@ -178,6 +173,7 @@ Patch9: gcc11-foffload-default.patch
 Patch10: gcc11-Wno-format-security.patch
 Patch11: gcc11-rh1574936.patch
 Patch12: gcc11-d-shared-libphobos.patch
+Patch13: gcc11-power10.patch
 
 
 %if 0%{?rhel} > 7
@@ -222,6 +218,7 @@ application binaries only.
 %patch11 -p0 -b .rh1574936~
 %endif
 %patch12 -p0 -b .d-shared-libphobos~
+%patch13 -p0 -b .power10~
 
 find gcc/testsuite -name \*.pr96939~ | xargs rm -f
 
@@ -290,10 +287,6 @@ cd obj-%{gcc_target_platform}
 
 %{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
 
-%ifarch ppc64le
-export PATH=/opt/rh/gcc-toolset-11/root/usr/bin:${PATH:+:${PATH}}
-%endif
-
 CC=gcc
 CXX=g++
 OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
@@ -457,7 +450,7 @@ rm -rf testlogs-%{_target_platform}-%{version}-%{release}
 
 %changelog
 * Wed Jul 14 2021 Marek Polacek <polacek@redhat.com> 11.1.1-6
-- update to GCC 11 (#1957766)
+- update to GCC 11 (#1983724)
 
 * Wed May 19 2021 Marek Polacek <polacek@redhat.com> 10.2.1-11
 - update from Fedora gcc 10.2.1-11 (#1933097)