SOURCES/gcc11-power10.patch

@@ -1,17 +0,0 @@
---- 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
- 	;;

SPECS/compat-sap-c++-11.spec

@@ -28,7 +28,7 @@ Summary: C++ compatibility runtime library for SAP applications
 Name: %{?scl_prefix}c++-11
 ExclusiveArch: x86_64 ppc64le
 Version: %{gcc_version}
-Release: %{gcc_release}%{?dist}
+Release: %{gcc_release}.1%{?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
@@ -119,6 +119,11 @@ 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).
@@ -173,7 +178,6 @@ 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
@@ -218,7 +222,6 @@ 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
 
@@ -287,6 +290,10 @@ 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'`
@@ -447,10 +454,42 @@ rm -rf testlogs-%{_target_platform}-%{version}-%{release}
 %{_root_prefix}/%{_lib}/compat-sap-c++-%{gcc_version}.so
 %{_root_prefix}/%{_lib}/compat-sap-c++-%{gcc_major}.so
 %{_root_prefix}/%{_lib}/README%{gcc_major}
+%ghost %{_root_prefix}/%{_lib}/libstdc++.so.6
+
+%transfiletriggerin -- %{_root_prefix}/%{_lib}
+if ! [ -d %{_root_prefix}/%{_lib} ]; then
+  exit 0
+fi
+symlink=%{_root_prefix}/%{_lib}/libstdc++.so.6
+if [ -e $symlink ] && ! [ -L $symlink ]; then
+  exit 0
+fi
+latest_so=$(ls %{_root_prefix}/%{_lib} | grep "^compat-sap-c++-[1-9][0-9]\.so$" | tail -n1)
+if [ -n $latest_so ]; then
+  ln -sf $latest_so $symlink
+fi
+%end
+
+%transfiletriggerpostun -- %{_root_prefix}/%{_lib}
+if ! [ -d %{_root_prefix}/%{_lib} ]; then
+  exit 0
+fi
+symlink=%{_root_prefix}/%{_lib}/libstdc++.so.6
+if [ -e $symlink ] && ! [ -L $symlink ]; then
+  exit 0
+fi
+latest_so=$(ls %{_root_prefix}/%{_lib} | grep "^compat-sap-c++-[1-9][0-9]\.so$" | tail -n1)
+if [ -n $latest_so ]; then
+  ln -sf $latest_so $symlink
+fi
+%end
 
 %changelog
+* Thu Jan 11 2024 Patrick Palka <ppalka@redhat.com> 11.1.1-6.1
+- provide /opt/rh/SAP/lib64/libstdc++.so.6 symlink (RHEL-21070)
+
 * Wed Jul 14 2021 Marek Polacek <polacek@redhat.com> 11.1.1-6
-- update to GCC 11 (#1983724)
+- update to GCC 11 (#1957766)
 
 * Wed May 19 2021 Marek Polacek <polacek@redhat.com> 10.2.1-11
 - update from Fedora gcc 10.2.1-11 (#1933097)