From 883b5d11381ce96e69a99a58f0a7d4be04348ccf Mon Sep 17 00:00:00 2001
From: Matti Viljanen <matti.viljanen@jolla.com>
Date: Thu, 12 Dec 2024 14:54:50 +0200
Subject: [PATCH] Change (base) name to gcc13, use --program-suffix

---
 rpm/cross-aarch64-gcc.spec | 74 ++++++++++++++------------------------
 rpm/cross-armv7hl-gcc.spec | 74 ++++++++++++++------------------------
 rpm/cross-i486-gcc.spec    | 74 ++++++++++++++------------------------
 rpm/cross-x86_64-gcc.spec  | 74 ++++++++++++++------------------------
 rpm/gcc.spec               | 54 ++++++++++++++--------------
 5 files changed, 136 insertions(+), 214 deletions(-)

diff --git a/rpm/cross-aarch64-gcc.spec b/rpm/cross-aarch64-gcc.spec
index cbd9ae4..f2423c2 100644
--- a/rpm/cross-aarch64-gcc.spec
+++ b/rpm/cross-aarch64-gcc.spec
@@ -103,6 +103,7 @@ ExclusiveArch: %ix86 x86_64
 # end crossbuild / accelerator section
 %endif
 
+%global binsuffix -13
 %global gcc_version 13.3.1
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
@@ -724,6 +725,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
         --enable-lto \
 	--enable-linker-build-id \
 	--disable-libmpx \
+  --program-suffix=%{binsuffix} \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++${enablelgo},lto \
 	--enable-threads=posix \
@@ -1250,8 +1252,8 @@ EOF
 chmod 755 %{buildroot}%{_prefix}/bin/c?9
 
 cd ..
-%find_lang %{name}
-%find_lang cpplib
+%find_lang %{name}%{binsuffix}
+%find_lang cpplib%{binsuffix}
 
 # Remove binaries we will not be including, so that they don't end up in
 # gcc-debuginfo
@@ -1395,26 +1397,6 @@ if posix.access ("/sbin/ldconfig", "x") then
   end
 end
 
-%post go
-pushd %{_bindir}
-if [ ! -f go ] ; then
-  ln -s go.gcc go
-fi
-if [ ! -f gofmt ] ; then
-  ln -s gofmt.gcc gofmt
-fi
-popd
-
-%preun go
-pushd %{_bindir}
-if [ -L go ]; then
-  rm go
-fi
-if [ -L gofmt ]; then
-  rm gofmt
-fi
-popd
-
 %post -n libstdc++ -p /sbin/ldconfig
 
 %postun -n libstdc++ -p /sbin/ldconfig
@@ -1453,17 +1435,17 @@ popd
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/cc
-%{_prefix}/bin/c89
-%{_prefix}/bin/c99
-%{_prefix}/bin/gcc
-%{_prefix}/bin/gcov
-%{_prefix}/bin/gcov-tool
-%{_prefix}/bin/gcov-dump
-%{_prefix}/bin/gcc-ar
-%{_prefix}/bin/gcc-nm
-%{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
+%{_prefix}/bin/cc%{binsuffix}
+%{_prefix}/bin/c89%{binsuffix}
+%{_prefix}/bin/c99%{binsuffix}
+%{_prefix}/bin/gcc%{binsuffix}
+%{_prefix}/bin/gcov%{binsuffix}
+%{_prefix}/bin/gcov-tool%{binsuffix}
+%{_prefix}/bin/gcov-dump%{binsuffix}
+%{_prefix}/bin/gcc-ar%{binsuffix}
+%{_prefix}/bin/gcc-nm%{binsuffix}
+%{_prefix}/bin/gcc-ranlib%{binsuffix}
+%{_prefix}/bin/lto-dump%{binsuffix}
 #%ifnarch %%{arm} aarch64 mipsel
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc-ar
@@ -1779,13 +1761,13 @@ popd
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcc.1*
-%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/gcov-tool.1*
-%{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/g++.1*
-%{_mandir}/man1/lto-dump.1*
+%{_mandir}/man1/cpp%{binsuffix}.1*
+%{_mandir}/man1/gcc%{binsuffix}.1*
+%{_mandir}/man1/gcov%{binsuffix}.1*
+%{_mandir}/man1/gcov-tool%{binsuffix}.1*
+%{_mandir}/man1/gcov-dump%{binsuffix}.1*
+%{_mandir}/man1/g++%{binsuffix}.1*
+%{_mandir}/man1/lto-dump%{binsuffix}.1*
 %{_mandir}/man7/*
 # !crossbuild
 %endif
@@ -1810,8 +1792,8 @@ popd
 %ifnarch %{arm} aarch64 mipsel
 %{_prefix}/bin/%{gcc_target_platform}-*++
 %endif
-%{_prefix}/bin/g++
-%{_prefix}/bin/c++
+%{_prefix}/bin/g++%{binsuffix}
+%{_prefix}/bin/c++%{binsuffix}
 %dir %{_prefix}/%{_lib}/gcc
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}/%{gcc_version}
@@ -2021,11 +2003,9 @@ popd
 
 %if %{build_go}
 %files go
-%ghost %{_prefix}/bin/go
-%attr(755,root,root) %{_prefix}/bin/go.gcc
-%{_prefix}/bin/gccgo
-%ghost %{_prefix}/bin/gofmt
-%attr(755,root,root) %{_prefix}/bin/gofmt.gcc
+%{_prefix}/bin/gccgo%{binsuffix}
+%{_prefix}/bin/go%{binsuffix}
+%{_prefix}/bin/gofmt%{binsuffix}
 %{_mandir}/man1/gccgo.1*
 %{_mandir}/man1/go.1*
 %{_mandir}/man1/gofmt.1*
diff --git a/rpm/cross-armv7hl-gcc.spec b/rpm/cross-armv7hl-gcc.spec
index 693684c..b67f2c3 100644
--- a/rpm/cross-armv7hl-gcc.spec
+++ b/rpm/cross-armv7hl-gcc.spec
@@ -103,6 +103,7 @@ ExclusiveArch: %ix86 x86_64
 # end crossbuild / accelerator section
 %endif
 
+%global binsuffix -13
 %global gcc_version 13.3.1
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
@@ -724,6 +725,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
         --enable-lto \
 	--enable-linker-build-id \
 	--disable-libmpx \
+  --program-suffix=%{binsuffix} \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++${enablelgo},lto \
 	--enable-threads=posix \
@@ -1250,8 +1252,8 @@ EOF
 chmod 755 %{buildroot}%{_prefix}/bin/c?9
 
 cd ..
-%find_lang %{name}
-%find_lang cpplib
+%find_lang %{name}%{binsuffix}
+%find_lang cpplib%{binsuffix}
 
 # Remove binaries we will not be including, so that they don't end up in
 # gcc-debuginfo
@@ -1395,26 +1397,6 @@ if posix.access ("/sbin/ldconfig", "x") then
   end
 end
 
-%post go
-pushd %{_bindir}
-if [ ! -f go ] ; then
-  ln -s go.gcc go
-fi
-if [ ! -f gofmt ] ; then
-  ln -s gofmt.gcc gofmt
-fi
-popd
-
-%preun go
-pushd %{_bindir}
-if [ -L go ]; then
-  rm go
-fi
-if [ -L gofmt ]; then
-  rm gofmt
-fi
-popd
-
 %post -n libstdc++ -p /sbin/ldconfig
 
 %postun -n libstdc++ -p /sbin/ldconfig
@@ -1453,17 +1435,17 @@ popd
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/cc
-%{_prefix}/bin/c89
-%{_prefix}/bin/c99
-%{_prefix}/bin/gcc
-%{_prefix}/bin/gcov
-%{_prefix}/bin/gcov-tool
-%{_prefix}/bin/gcov-dump
-%{_prefix}/bin/gcc-ar
-%{_prefix}/bin/gcc-nm
-%{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
+%{_prefix}/bin/cc%{binsuffix}
+%{_prefix}/bin/c89%{binsuffix}
+%{_prefix}/bin/c99%{binsuffix}
+%{_prefix}/bin/gcc%{binsuffix}
+%{_prefix}/bin/gcov%{binsuffix}
+%{_prefix}/bin/gcov-tool%{binsuffix}
+%{_prefix}/bin/gcov-dump%{binsuffix}
+%{_prefix}/bin/gcc-ar%{binsuffix}
+%{_prefix}/bin/gcc-nm%{binsuffix}
+%{_prefix}/bin/gcc-ranlib%{binsuffix}
+%{_prefix}/bin/lto-dump%{binsuffix}
 #%ifnarch %%{arm} aarch64 mipsel
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc-ar
@@ -1779,13 +1761,13 @@ popd
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcc.1*
-%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/gcov-tool.1*
-%{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/g++.1*
-%{_mandir}/man1/lto-dump.1*
+%{_mandir}/man1/cpp%{binsuffix}.1*
+%{_mandir}/man1/gcc%{binsuffix}.1*
+%{_mandir}/man1/gcov%{binsuffix}.1*
+%{_mandir}/man1/gcov-tool%{binsuffix}.1*
+%{_mandir}/man1/gcov-dump%{binsuffix}.1*
+%{_mandir}/man1/g++%{binsuffix}.1*
+%{_mandir}/man1/lto-dump%{binsuffix}.1*
 %{_mandir}/man7/*
 # !crossbuild
 %endif
@@ -1810,8 +1792,8 @@ popd
 %ifnarch %{arm} aarch64 mipsel
 %{_prefix}/bin/%{gcc_target_platform}-*++
 %endif
-%{_prefix}/bin/g++
-%{_prefix}/bin/c++
+%{_prefix}/bin/g++%{binsuffix}
+%{_prefix}/bin/c++%{binsuffix}
 %dir %{_prefix}/%{_lib}/gcc
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}/%{gcc_version}
@@ -2021,11 +2003,9 @@ popd
 
 %if %{build_go}
 %files go
-%ghost %{_prefix}/bin/go
-%attr(755,root,root) %{_prefix}/bin/go.gcc
-%{_prefix}/bin/gccgo
-%ghost %{_prefix}/bin/gofmt
-%attr(755,root,root) %{_prefix}/bin/gofmt.gcc
+%{_prefix}/bin/gccgo%{binsuffix}
+%{_prefix}/bin/go%{binsuffix}
+%{_prefix}/bin/gofmt%{binsuffix}
 %{_mandir}/man1/gccgo.1*
 %{_mandir}/man1/go.1*
 %{_mandir}/man1/gofmt.1*
diff --git a/rpm/cross-i486-gcc.spec b/rpm/cross-i486-gcc.spec
index de0239e..8a7c3d5 100644
--- a/rpm/cross-i486-gcc.spec
+++ b/rpm/cross-i486-gcc.spec
@@ -103,6 +103,7 @@ ExclusiveArch: %ix86 x86_64
 # end crossbuild / accelerator section
 %endif
 
+%global binsuffix -13
 %global gcc_version 13.3.1
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
@@ -724,6 +725,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
         --enable-lto \
 	--enable-linker-build-id \
 	--disable-libmpx \
+  --program-suffix=%{binsuffix} \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++${enablelgo},lto \
 	--enable-threads=posix \
@@ -1250,8 +1252,8 @@ EOF
 chmod 755 %{buildroot}%{_prefix}/bin/c?9
 
 cd ..
-%find_lang %{name}
-%find_lang cpplib
+%find_lang %{name}%{binsuffix}
+%find_lang cpplib%{binsuffix}
 
 # Remove binaries we will not be including, so that they don't end up in
 # gcc-debuginfo
@@ -1395,26 +1397,6 @@ if posix.access ("/sbin/ldconfig", "x") then
   end
 end
 
-%post go
-pushd %{_bindir}
-if [ ! -f go ] ; then
-  ln -s go.gcc go
-fi
-if [ ! -f gofmt ] ; then
-  ln -s gofmt.gcc gofmt
-fi
-popd
-
-%preun go
-pushd %{_bindir}
-if [ -L go ]; then
-  rm go
-fi
-if [ -L gofmt ]; then
-  rm gofmt
-fi
-popd
-
 %post -n libstdc++ -p /sbin/ldconfig
 
 %postun -n libstdc++ -p /sbin/ldconfig
@@ -1453,17 +1435,17 @@ popd
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/cc
-%{_prefix}/bin/c89
-%{_prefix}/bin/c99
-%{_prefix}/bin/gcc
-%{_prefix}/bin/gcov
-%{_prefix}/bin/gcov-tool
-%{_prefix}/bin/gcov-dump
-%{_prefix}/bin/gcc-ar
-%{_prefix}/bin/gcc-nm
-%{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
+%{_prefix}/bin/cc%{binsuffix}
+%{_prefix}/bin/c89%{binsuffix}
+%{_prefix}/bin/c99%{binsuffix}
+%{_prefix}/bin/gcc%{binsuffix}
+%{_prefix}/bin/gcov%{binsuffix}
+%{_prefix}/bin/gcov-tool%{binsuffix}
+%{_prefix}/bin/gcov-dump%{binsuffix}
+%{_prefix}/bin/gcc-ar%{binsuffix}
+%{_prefix}/bin/gcc-nm%{binsuffix}
+%{_prefix}/bin/gcc-ranlib%{binsuffix}
+%{_prefix}/bin/lto-dump%{binsuffix}
 #%ifnarch %%{arm} aarch64 mipsel
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc-ar
@@ -1779,13 +1761,13 @@ popd
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcc.1*
-%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/gcov-tool.1*
-%{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/g++.1*
-%{_mandir}/man1/lto-dump.1*
+%{_mandir}/man1/cpp%{binsuffix}.1*
+%{_mandir}/man1/gcc%{binsuffix}.1*
+%{_mandir}/man1/gcov%{binsuffix}.1*
+%{_mandir}/man1/gcov-tool%{binsuffix}.1*
+%{_mandir}/man1/gcov-dump%{binsuffix}.1*
+%{_mandir}/man1/g++%{binsuffix}.1*
+%{_mandir}/man1/lto-dump%{binsuffix}.1*
 %{_mandir}/man7/*
 # !crossbuild
 %endif
@@ -1810,8 +1792,8 @@ popd
 %ifnarch %{arm} aarch64 mipsel
 %{_prefix}/bin/%{gcc_target_platform}-*++
 %endif
-%{_prefix}/bin/g++
-%{_prefix}/bin/c++
+%{_prefix}/bin/g++%{binsuffix}
+%{_prefix}/bin/c++%{binsuffix}
 %dir %{_prefix}/%{_lib}/gcc
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}/%{gcc_version}
@@ -2021,11 +2003,9 @@ popd
 
 %if %{build_go}
 %files go
-%ghost %{_prefix}/bin/go
-%attr(755,root,root) %{_prefix}/bin/go.gcc
-%{_prefix}/bin/gccgo
-%ghost %{_prefix}/bin/gofmt
-%attr(755,root,root) %{_prefix}/bin/gofmt.gcc
+%{_prefix}/bin/gccgo%{binsuffix}
+%{_prefix}/bin/go%{binsuffix}
+%{_prefix}/bin/gofmt%{binsuffix}
 %{_mandir}/man1/gccgo.1*
 %{_mandir}/man1/go.1*
 %{_mandir}/man1/gofmt.1*
diff --git a/rpm/cross-x86_64-gcc.spec b/rpm/cross-x86_64-gcc.spec
index cb535a0..62b5325 100644
--- a/rpm/cross-x86_64-gcc.spec
+++ b/rpm/cross-x86_64-gcc.spec
@@ -103,6 +103,7 @@ ExclusiveArch: %ix86 x86_64
 # end crossbuild / accelerator section
 %endif
 
+%global binsuffix -13
 %global gcc_version 13.3.1
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
@@ -724,6 +725,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
         --enable-lto \
 	--enable-linker-build-id \
 	--disable-libmpx \
+  --program-suffix=%{binsuffix} \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++${enablelgo},lto \
 	--enable-threads=posix \
@@ -1250,8 +1252,8 @@ EOF
 chmod 755 %{buildroot}%{_prefix}/bin/c?9
 
 cd ..
-%find_lang %{name}
-%find_lang cpplib
+%find_lang %{name}%{binsuffix}
+%find_lang cpplib%{binsuffix}
 
 # Remove binaries we will not be including, so that they don't end up in
 # gcc-debuginfo
@@ -1395,26 +1397,6 @@ if posix.access ("/sbin/ldconfig", "x") then
   end
 end
 
-%post go
-pushd %{_bindir}
-if [ ! -f go ] ; then
-  ln -s go.gcc go
-fi
-if [ ! -f gofmt ] ; then
-  ln -s gofmt.gcc gofmt
-fi
-popd
-
-%preun go
-pushd %{_bindir}
-if [ -L go ]; then
-  rm go
-fi
-if [ -L gofmt ]; then
-  rm gofmt
-fi
-popd
-
 %post -n libstdc++ -p /sbin/ldconfig
 
 %postun -n libstdc++ -p /sbin/ldconfig
@@ -1453,17 +1435,17 @@ popd
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/cc
-%{_prefix}/bin/c89
-%{_prefix}/bin/c99
-%{_prefix}/bin/gcc
-%{_prefix}/bin/gcov
-%{_prefix}/bin/gcov-tool
-%{_prefix}/bin/gcov-dump
-%{_prefix}/bin/gcc-ar
-%{_prefix}/bin/gcc-nm
-%{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
+%{_prefix}/bin/cc%{binsuffix}
+%{_prefix}/bin/c89%{binsuffix}
+%{_prefix}/bin/c99%{binsuffix}
+%{_prefix}/bin/gcc%{binsuffix}
+%{_prefix}/bin/gcov%{binsuffix}
+%{_prefix}/bin/gcov-tool%{binsuffix}
+%{_prefix}/bin/gcov-dump%{binsuffix}
+%{_prefix}/bin/gcc-ar%{binsuffix}
+%{_prefix}/bin/gcc-nm%{binsuffix}
+%{_prefix}/bin/gcc-ranlib%{binsuffix}
+%{_prefix}/bin/lto-dump%{binsuffix}
 #%ifnarch %%{arm} aarch64 mipsel
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc-ar
@@ -1779,13 +1761,13 @@ popd
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcc.1*
-%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/gcov-tool.1*
-%{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/g++.1*
-%{_mandir}/man1/lto-dump.1*
+%{_mandir}/man1/cpp%{binsuffix}.1*
+%{_mandir}/man1/gcc%{binsuffix}.1*
+%{_mandir}/man1/gcov%{binsuffix}.1*
+%{_mandir}/man1/gcov-tool%{binsuffix}.1*
+%{_mandir}/man1/gcov-dump%{binsuffix}.1*
+%{_mandir}/man1/g++%{binsuffix}.1*
+%{_mandir}/man1/lto-dump%{binsuffix}.1*
 %{_mandir}/man7/*
 # !crossbuild
 %endif
@@ -1810,8 +1792,8 @@ popd
 %ifnarch %{arm} aarch64 mipsel
 %{_prefix}/bin/%{gcc_target_platform}-*++
 %endif
-%{_prefix}/bin/g++
-%{_prefix}/bin/c++
+%{_prefix}/bin/g++%{binsuffix}
+%{_prefix}/bin/c++%{binsuffix}
 %dir %{_prefix}/%{_lib}/gcc
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}/%{gcc_version}
@@ -2021,11 +2003,9 @@ popd
 
 %if %{build_go}
 %files go
-%ghost %{_prefix}/bin/go
-%attr(755,root,root) %{_prefix}/bin/go.gcc
-%{_prefix}/bin/gccgo
-%ghost %{_prefix}/bin/gofmt
-%attr(755,root,root) %{_prefix}/bin/gofmt.gcc
+%{_prefix}/bin/gccgo%{binsuffix}
+%{_prefix}/bin/go%{binsuffix}
+%{_prefix}/bin/gofmt%{binsuffix}
 %{_mandir}/man1/gccgo.1*
 %{_mandir}/man1/go.1*
 %{_mandir}/man1/gofmt.1*
diff --git a/rpm/gcc.spec b/rpm/gcc.spec
index 3aec84b..ed2cd2c 100644
--- a/rpm/gcc.spec
+++ b/rpm/gcc.spec
@@ -1,5 +1,5 @@
 # Combined gcc / cross-armv*-gcc) specfile
-Name: gcc
+Name: gcc13
 # Keep Name on top !
 
 %if "%{?bootstrap}" == ""
@@ -102,6 +102,7 @@ ExclusiveArch: %ix86 x86_64
 # end crossbuild / accelerator section
 %endif
 
+%global binsuffix -13
 %global gcc_version 13.3.1
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
@@ -723,6 +724,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
         --enable-lto \
 	--enable-linker-build-id \
 	--disable-libmpx \
+  --program-suffix=%{binsuffix} \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++${enablelgo},lto \
 	--enable-threads=posix \
@@ -1249,8 +1251,8 @@ EOF
 chmod 755 %{buildroot}%{_prefix}/bin/c?9
 
 cd ..
-%find_lang %{name}
-%find_lang cpplib
+%find_lang %{name}%{binsuffix}
+%find_lang cpplib%{binsuffix}
 
 # Remove binaries we will not be including, so that they don't end up in
 # gcc-debuginfo
@@ -1432,17 +1434,17 @@ end
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/cc
-%{_prefix}/bin/c89
-%{_prefix}/bin/c99
-%{_prefix}/bin/gcc
-%{_prefix}/bin/gcov
-%{_prefix}/bin/gcov-tool
-%{_prefix}/bin/gcov-dump
-%{_prefix}/bin/gcc-ar
-%{_prefix}/bin/gcc-nm
-%{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
+%{_prefix}/bin/cc%{binsuffix}
+%{_prefix}/bin/c89%{binsuffix}
+%{_prefix}/bin/c99%{binsuffix}
+%{_prefix}/bin/gcc%{binsuffix}
+%{_prefix}/bin/gcov%{binsuffix}
+%{_prefix}/bin/gcov-tool%{binsuffix}
+%{_prefix}/bin/gcov-dump%{binsuffix}
+%{_prefix}/bin/gcc-ar%{binsuffix}
+%{_prefix}/bin/gcc-nm%{binsuffix}
+%{_prefix}/bin/gcc-ranlib%{binsuffix}
+%{_prefix}/bin/lto-dump%{binsuffix}
 #%ifnarch %%{arm} aarch64 mipsel
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc
 #%%{_prefix}/bin/%%{gcc_target_platform}-gcc-ar
@@ -1758,13 +1760,13 @@ end
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcc.1*
-%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/gcov-tool.1*
-%{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/g++.1*
-%{_mandir}/man1/lto-dump.1*
+%{_mandir}/man1/cpp%{binsuffix}.1*
+%{_mandir}/man1/gcc%{binsuffix}.1*
+%{_mandir}/man1/gcov%{binsuffix}.1*
+%{_mandir}/man1/gcov-tool%{binsuffix}.1*
+%{_mandir}/man1/gcov-dump%{binsuffix}.1*
+%{_mandir}/man1/g++%{binsuffix}.1*
+%{_mandir}/man1/lto-dump%{binsuffix}.1*
 %{_mandir}/man7/*
 # !crossbuild
 %endif
@@ -1789,8 +1791,8 @@ end
 %ifnarch %{arm} aarch64 mipsel
 %{_prefix}/bin/%{gcc_target_platform}-*++
 %endif
-%{_prefix}/bin/g++
-%{_prefix}/bin/c++
+%{_prefix}/bin/g++%{binsuffix}
+%{_prefix}/bin/c++%{binsuffix}
 %dir %{_prefix}/%{_lib}/gcc
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}
 %dir %{_prefix}/%{_lib}/gcc/%{gcc_target_platform}/%{gcc_version}
@@ -2000,9 +2002,9 @@ end
 
 %if %{build_go}
 %files go
-%attr(755,root,root) %{_prefix}/bin/go.gcc
-%{_prefix}/bin/gccgo
-%attr(755,root,root) %{_prefix}/bin/gofmt.gcc
+%{_prefix}/bin/gccgo%{binsuffix}
+%{_prefix}/bin/go%{binsuffix}
+%{_prefix}/bin/gofmt%{binsuffix}
 %{_mandir}/man1/gccgo.1*
 %{_mandir}/man1/go.1*
 %{_mandir}/man1/gofmt.1*