Enable CPU compatibility diagnostics in ld.so (RHEL-31738)

Resolves: RHEL-31738
Related: RHEL-35602

Fedora 40 commit: dc6792e4d3
This commit is contained in:
Arjun Shankar 2024-06-07 15:39:07 +02:00
parent 53900028ae
commit 1eabd6588f

View File

@ -170,7 +170,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 13 %global baserelease 14
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# Licenses: # Licenses:
@ -237,8 +237,13 @@ Source11: parse-SUPPORTED.py
# Include in the source RPM for reference. # Include in the source RPM for reference.
Source12: ChangeLog.old Source12: ChangeLog.old
# ABI-specific program interpreter name. Used for debuginfo # glibc_ldso: ABI-specific program interpreter name. Used for debuginfo
# extraction (wrap-find-debuginfo.sh) and smoke testing ($run_ldso below). # extraction (wrap-find-debuginfo.sh) and smoke testing ($run_ldso below).
#
# glibc_rtld_early_cflags: The ABI baseline for architectures with
# potentially a later baseline. The --with-rtld-early-cflags=
# configure option is passed to the main glibc build if this macro is
# defined.
%ifarch %{ix86} %ifarch %{ix86}
%global glibc_ldso /lib/ld-linux.so.2 %global glibc_ldso /lib/ld-linux.so.2
%endif %endif
@ -250,6 +255,7 @@ Source12: ChangeLog.old
%endif %endif
%ifarch ppc64 %ifarch ppc64
%global glibc_ldso /lib64/ld64.so.1 %global glibc_ldso /lib64/ld64.so.1
%define glibc_rtld_early_cflags -mcpu=power8
%endif %endif
%ifarch ppc64le %ifarch ppc64le
%global glibc_ldso /lib64/ld64.so.2 %global glibc_ldso /lib64/ld64.so.2
@ -259,12 +265,15 @@ Source12: ChangeLog.old
%endif %endif
%ifarch s390 %ifarch s390
%global glibc_ldso /lib/ld.so.1 %global glibc_ldso /lib/ld.so.1
%define glibc_rtld_early_cflags -march=z13
%endif %endif
%ifarch s390x %ifarch s390x
%global glibc_ldso /lib/ld64.so.1 %global glibc_ldso /lib/ld64.so.1
%define glibc_rtld_early_cflags -march=z13
%endif %endif
%ifarch x86_64 x86_64_v2 x86_64_v3 x86_64_v4 %ifarch x86_64 x86_64_v2 x86_64_v3 x86_64_v4
%global glibc_ldso /lib64/ld-linux-x86-64.so.2 %global glibc_ldso /lib64/ld-linux-x86-64.so.2
%define glibc_rtld_early_cflags -march=x86-64
%endif %endif
###################################################################### ######################################################################
@ -1428,6 +1437,7 @@ build build-%{target} \
CC="gcc $glibc_flags_cc $glibc_flags_cc_main" \ CC="gcc $glibc_flags_cc $glibc_flags_cc_main" \
CXX="g++ $glibc_flags_cc $glibc_flags_cc_main" \ CXX="g++ $glibc_flags_cc $glibc_flags_cc_main" \
CFLAGS="$glibc_flags_cflags" \ CFLAGS="$glibc_flags_cflags" \
%{?glibc_rtld_early_cflags:--with-rtld-early-cflags=%glibc_rtld_early_cflags} \
%ifarch x86_64 %ifarch x86_64
--enable-cet \ --enable-cet \
%endif %endif
@ -2601,6 +2611,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %changelog
* Fri May 31 2024 Florian Weimer <fweimer@redhat.com> - 2.39-14
- Enable CPU compatibility diagnostics in ld.so (#2276631, RHEL-31738)
* Wed May 15 2024 Arjun Shankar <arjun@redhat.com> - 2.39-13 * Wed May 15 2024 Arjun Shankar <arjun@redhat.com> - 2.39-13
- Move memory tracing libraries to glibc-utils - Move memory tracing libraries to glibc-utils