.compat-sap-c++-10.metadata

@@ -1 +1 @@
-1963e0a56723ae67e0891e3a816e7a26fc13802f SOURCES/gcc-10.2.1-20200723.tar.xz
+c2c3a9b0ec1bbf57be1f75bcf01e1e188c8dc225 SOURCES/gcc-10.1.1-20200507.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/gcc-10.2.1-20200723.tar.xz
+SOURCES/gcc-10.1.1-20200507.tar.xz

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

@@ -6,16 +6,16 @@
 %global _root_mandir %{_root_prefix}/%{_mandir}
 %{?scl:%global __strip strip}
 %{?scl:%global __objdump objdump}
-%global DATE 20200723
+%global DATE 20200507
-%global gitrev 3fc88aa16f1bf661db4518d6d62869f081981981
+%global gitrev 563509ad4338c7193d06f4008e9df657990628a5
-%global gcc_version 10.2.1
+%global gcc_version 10.1.1
 %global gcc_major 10
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
 %undefine _annotated_build
-%global multilib_64_archs sparc64 ppc64 x86_64
+%global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global attr_ifunc 1
 %else
@@ -26,9 +26,9 @@
 %endif
 Summary: C++ compatibility runtime library for SAP applications
 Name: %{?scl_prefix}c++-10
-ExclusiveArch: x86_64 ppc64le s390x
+ExclusiveArch: x86_64 ppc64le
 Version: %{gcc_version}
-Release: %{gcc_release}.1%{?dist}
+Release: %{gcc_release}%{?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
@@ -112,7 +112,7 @@ Requires: libgcc >= 4.1.2-43
 # Keep this for now.
 Requires: libgomp >= 4.4.4-13
 BuildRequires: gmp-devel >= 4.1.2-8
-BuildRequires: mpfr-devel >= 3.1.0
+BuildRequires: mpfr-devel >= 2.2.1
 %if 0%{?rhel} >= 7
 BuildRequires: libmpc-devel >= 0.8.1
 %endif
@@ -256,7 +256,6 @@ cd obj-%{gcc_target_platform}
 CC=gcc
 CXX=g++
 OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-flto//g;s/-ffat-lto-objects//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
@@ -272,9 +271,10 @@ CONFIGURE_OPTS="\
 	--prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
 	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
 	--enable-shared --enable-threads=posix --enable-checking=release \
-	--disable-multilib \
 %ifarch ppc64le
-	--enable-targets=powerpcle-linux \
+	--enable-targets=powerpcle-linux --disable-multilib \
+%else
+	--enable-multilib \
 %endif
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	--enable-gnu-unique-object \
@@ -402,15 +402,5 @@ rm -rf %{buildroot}
 %{_root_prefix}/%{_lib}/README%{gcc_major}
 
 %changelog
-* Thu May 26 2022 Marek Polacek <polacek@redhat.com> 10.2.1-1.1
-- build on s390x too (#2065777)
-- disable multilib
-
-* Wed Jul 29 2020 Marek Polacek <polacek@redhat.com> 10.2.1-1
-- GCC 10.2 release
-- disable -flto in %%{optflags}, lto bootstrap will be enabled the GCC way
-  later
-- require MPFR Library version 3.1.0 (or later)
-
 * Thu Jun  4 2020 Marek Polacek <polacek@redhat.com> 10.1.1-1
 - new package