From fc331cd52801712e6f81f40ce50fa564cfe84414 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 7 Apr 2021 11:11:46 +0200
Subject: [PATCH] Remove power9 multilib (#1889978)

Resolves: #1889978
---
 glibc.spec | 43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 003abf4..28893f0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -58,13 +58,6 @@
 # Only some architectures have static PIE support.
 %define pie_arches %{ix86} x86_64
 
-# Build the POWER9 runtime on POWER, but only for downstream.
-%ifarch ppc64le
-%define buildpower9 0%{?rhel} > 0
-%else
-%define buildpower9 0
-%endif
-
 ##############################################################################
 # Any architecture/kernel combination that supports running 32-bit and 64-bit
 # code in userspace is considered a biarch arch.
@@ -96,7 +89,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -1184,15 +1177,6 @@ build()
 # Default set of compiler options.
 build
 
-%if %{buildpower9}
-(
-  GCC="$GCC -mcpu=power9 -mtune=power9"
-  GXX="$GXX -mcpu=power9 -mtune=power9"
-  core_with_options="--with-cpu=power9"
-  build power9
-)
-%endif
-
 ##############################################################################
 # Install glibc...
 ##############################################################################
@@ -1277,12 +1261,6 @@ install_different()
 	done
 }
 
-%if %{buildpower9}
-pushd build-%{target}-power9
-install_different "$RPM_BUILD_ROOT/%{_lib}" power9 ..
-popd
-%endif
-
 ##############################################################################
 # Remove the files we don't want to distribute
 ##############################################################################
@@ -1989,15 +1967,6 @@ pushd build-%{target}
 run_tests
 popd
 
-%if %{buildpower9}
-echo ====================TESTING -mcpu=power9=============
-pushd build-%{target}-power9
-run_tests
-popd
-%endif
-
-
-
 echo ====================TESTING END=====================
 PLTCMD='/^Relocation section .*\(\.rela\?\.plt\|\.rela\.IA_64\.pltoff\)/,/^$/p'
 echo ====================PLT RELOCS LD.SO================
@@ -2092,7 +2061,9 @@ local remove_dirs = { "%{_libdir}/i686",
 		      "%{_libdir}/i686/nosegneg",
 		      "%{_libdir}/power6",
 		      "%{_libdir}/power7",
-		      "%{_libdir}/power8" }
+		      "%{_libdir}/power8"
+		      "%{_libdir}/power9"
+		    }
 
 -- Walk all the directories with files we need to remove...
 for _, rdir in ipairs (remove_dirs) do
@@ -2220,9 +2191,6 @@ fi
 
 %files -f glibc.filelist
 %dir %{_prefix}/%{_lib}/audit
-%if %{buildpower9}
-%dir /%{_lib}/power9
-%endif
 %verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf
 %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf
 %verify(not md5 size mtime) %config(noreplace) /etc/rpc
@@ -2309,6 +2277,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Wed Apr  7 2021 Florian Weimer <fweimer@redhat.com> - 2.33-6
+- Remove power9 multilib (#1889978)
+
 * Tue Mar 16 2021 Florian Weimer <fweimer@redhat.com> - 2.33-5
 - Import patches from the upstream glibc 2.33 branch, up to commit
   db32fc27e7bdfb5468200a94e9152bcc1c971d25: