Add POWER9 multilib (downstream only)
This commit is contained in:
parent
48fa0d009d
commit
cc9621cd19
63
glibc.spec
63
glibc.spec
@ -1,6 +1,6 @@
|
|||||||
%define glibcsrcdir glibc-2.27-71-g5fab7fe1dc
|
%define glibcsrcdir glibc-2.27-71-g5fab7fe1dc
|
||||||
%define glibcversion 2.27
|
%define glibcversion 2.27
|
||||||
%define glibcrelease 28%{?dist}
|
%define glibcrelease 29%{?dist}
|
||||||
# Pre-release tarballs are pulled in from git using a command that is
|
# Pre-release tarballs are pulled in from git using a command that is
|
||||||
# effectively:
|
# effectively:
|
||||||
#
|
#
|
||||||
@ -95,6 +95,13 @@
|
|||||||
# 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
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Any architecture/kernel combination that supports running 32-bit and 64-bit
|
# Any architecture/kernel combination that supports running 32-bit and 64-bit
|
||||||
# code in userspace is considered a biarch arch.
|
# code in userspace is considered a biarch arch.
|
||||||
@ -890,9 +897,12 @@ rpm_inherit_flags ()
|
|||||||
|
|
||||||
# Propgate select compiler flags from redhat-rpm-config. These flags
|
# Propgate select compiler flags from redhat-rpm-config. These flags
|
||||||
# are target-dependent, so we use only those which are specified in
|
# are target-dependent, so we use only those which are specified in
|
||||||
# redhat-rpm-config. We do not replicate the -march=/-mtune=
|
# redhat-rpm-config. We keep the -m32/-m32/-m64 flags to support
|
||||||
# selection here because these match the defaults compiled into GCC.
|
# multilib builds.
|
||||||
# We keep the -m32/-m32/-m64 flags to support multilib builds.
|
#
|
||||||
|
# Note: For building alternative run-times, care is required to avoid
|
||||||
|
# overriding the architecture flags which go into CC/CXX. The flags
|
||||||
|
# below are passed in CFLAGS.
|
||||||
|
|
||||||
rpm_inherit_flags \
|
rpm_inherit_flags \
|
||||||
"-fasynchronous-unwind-tables" \
|
"-fasynchronous-unwind-tables" \
|
||||||
@ -1003,9 +1013,7 @@ build()
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
##############################################################################
|
# Default set of options.
|
||||||
# Build glibc for the default set of options.
|
|
||||||
##############################################################################
|
|
||||||
build
|
build
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
@ -1050,6 +1058,15 @@ build
|
|||||||
)
|
)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%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...
|
||||||
##############################################################################
|
##############################################################################
|
||||||
@ -1139,6 +1156,12 @@ install_different()
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
%if %{buildpower9}
|
||||||
|
pushd build-%{target}-power9
|
||||||
|
install_different "$RPM_BUILD_ROOT/%{_lib}" power9 ..
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Install the power6 build files.
|
# Install the power6 build files.
|
||||||
##############################################################################
|
##############################################################################
|
||||||
@ -1819,17 +1842,8 @@ run_tests () {
|
|||||||
export TIMEOUTFACTOR=16
|
export TIMEOUTFACTOR=16
|
||||||
parent=$$
|
parent=$$
|
||||||
echo ====================TESTING=========================
|
echo ====================TESTING=========================
|
||||||
##############################################################################
|
|
||||||
# - Test the default runtime.
|
# Default libraries.
|
||||||
# - Power 620 / 970 ISA for 64-bit POWER BE.
|
|
||||||
# - POWER8 for 64-bit POWER LE.
|
|
||||||
# - ??? for 64-bit x86_64
|
|
||||||
# - ??? for 32-bit x86
|
|
||||||
# - ??? for 64-bit AArch64
|
|
||||||
# - ??? for 32-bit ARM
|
|
||||||
# - zEC12 for 64-bit s390x
|
|
||||||
# - ??? for 32-bit s390
|
|
||||||
##############################################################################
|
|
||||||
pushd build-%{target}
|
pushd build-%{target}
|
||||||
run_tests
|
run_tests
|
||||||
popd
|
popd
|
||||||
@ -1867,6 +1881,13 @@ run_tests
|
|||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%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================
|
||||||
@ -1974,6 +1995,9 @@ fi
|
|||||||
%if %{buildpower8}
|
%if %{buildpower8}
|
||||||
%dir /%{_lib}/power8
|
%dir /%{_lib}/power8
|
||||||
%endif
|
%endif
|
||||||
|
%if %{buildpower9}
|
||||||
|
%dir /%{_lib}/power9
|
||||||
|
%endif
|
||||||
%ifarch s390x
|
%ifarch s390x
|
||||||
/lib/ld64.so.1
|
/lib/ld64.so.1
|
||||||
%endif
|
%endif
|
||||||
@ -2061,6 +2085,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-29
|
||||||
|
- Add POWER9 multilib (downstream only)
|
||||||
|
|
||||||
* Wed Jul 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-28
|
* Wed Jul 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-28
|
||||||
- Work around valgrind issue on i686 (#1600034)
|
- Work around valgrind issue on i686 (#1600034)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user