Remove spec file support for power9 multilib

This is not used in Fedora, and downstream removed the multilib
as well.
This commit is contained in:
Florian Weimer 2021-05-07 11:41:27 +02:00
parent caadb46589
commit f0cbcb3912

View File

@ -58,13 +58,6 @@
# Only some architectures have static PIE support. # Only some architectures have static PIE support.
%define pie_arches %{ix86} x86_64 %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
# The annobin annotations cause binutils to produce broken ARM EABI # The annobin annotations cause binutils to produce broken ARM EABI
# unwinding information. Symptom is a hang/test failure for # unwinding information. Symptom is a hang/test failure for
# malloc/tst-malloc-stats-cancellation. See # malloc/tst-malloc-stats-cancellation. See
@ -1185,15 +1178,6 @@ build()
# Default set of compiler options. # Default set of compiler options.
build 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... # Install glibc...
############################################################################## ##############################################################################
@ -1278,12 +1262,6 @@ install_different()
done 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 # Remove the files we don't want to distribute
############################################################################## ##############################################################################
@ -1990,15 +1968,6 @@ pushd build-%{target}
run_tests run_tests
popd popd
%if %{buildpower9}
echo ====================TESTING -mcpu=power9=============
pushd build-%{target}-power9
run_tests
popd
%endif
echo ====================TESTING END===================== echo ====================TESTING END=====================
PLTCMD='/^Relocation section .*\(\.rela\?\.plt\|\.rela\.IA_64\.pltoff\)/,/^$/p' PLTCMD='/^Relocation section .*\(\.rela\?\.plt\|\.rela\.IA_64\.pltoff\)/,/^$/p'
echo ====================PLT RELOCS LD.SO================ echo ====================PLT RELOCS LD.SO================
@ -2093,7 +2062,9 @@ local remove_dirs = { "%{_libdir}/i686",
"%{_libdir}/i686/nosegneg", "%{_libdir}/i686/nosegneg",
"%{_libdir}/power6", "%{_libdir}/power6",
"%{_libdir}/power7", "%{_libdir}/power7",
"%{_libdir}/power8" } "%{_libdir}/power8",
"%{_libdir}/power9",
}
-- Walk all the directories with files we need to remove... -- Walk all the directories with files we need to remove...
for _, rdir in ipairs (remove_dirs) do for _, rdir in ipairs (remove_dirs) do
@ -2221,9 +2192,6 @@ fi
%files -f glibc.filelist %files -f glibc.filelist
%dir %{_prefix}/%{_lib}/audit %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/nsswitch.conf
%verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf
%verify(not md5 size mtime) %config(noreplace) /etc/rpc %verify(not md5 size mtime) %config(noreplace) /etc/rpc