x86: Use CHECK_FEATURE_PRESENT on PCONFIG (#2149615)

Additional upstream patch to fix a potential build-time
testsuite failure.

Resolves: #2149615
This commit is contained in:
DJ Delorie 2023-04-06 13:30:24 -04:00
parent 85f2a33c60
commit ab766cb47a
2 changed files with 26 additions and 1 deletions

21
glibc-rh2149615-3.patch Normal file
View File

@ -0,0 +1,21 @@
From 6229aa74fb47af17744d765cc49dbf94d3cefe12 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 26 Jan 2022 12:18:30 -0800
Subject: x86: Use CHECK_FEATURE_PRESENT on PCONFIG
PCONFIG is a privileged instruction. Use CHECK_FEATURE_PRESENT, instead
of CHECK_FEATURE_ACTIVE, on PCONFIG in tst-cpu-features-supports.c.
diff --git a/sysdeps/x86/tst-cpu-features-supports.c b/sysdeps/x86/tst-cpu-features-supports.c
index 9f10f02954..11065b642f 100644
--- a/sysdeps/x86/tst-cpu-features-supports.c
+++ b/sysdeps/x86/tst-cpu-features-supports.c
@@ -143,7 +143,7 @@ do_test (int argc, char **argv)
fails += CHECK_FEATURE_ACTIVE (movdiri, MOVDIRI);
fails += CHECK_FEATURE_ACTIVE (movdir64b, MOVDIR64B);
fails += CHECK_FEATURE_ACTIVE (osxsave, OSXSAVE);
- fails += CHECK_FEATURE_ACTIVE (pconfig, PCONFIG);
+ fails += CHECK_FEATURE_PRESENT (pconfig, PCONFIG);
fails += CHECK_FEATURE_ACTIVE (pku, PKU);
#endif
fails += CHECK_FEATURE_ACTIVE (popcnt, POPCNT);

View File

@ -155,7 +155,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 63%{?dist}
Release: 64%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -705,6 +705,7 @@ Patch472: glibc-rh2149615-1.patch
Patch473: glibc-rh2149615-2.patch
Patch474: glibc-rh2169978-1.patch
Patch475: glibc-rh2169978-2.patch
Patch476: glibc-rh2149615-3.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -2864,6 +2865,9 @@ fi
%endif
%changelog
* Thu Apr 06 2023 DJ Delorie <dj@redhat.com> - 2.34-64
- x86: Use CHECK_FEATURE_PRESENT on PCONFIG (#2149615)
* Thu Mar 30 2023 Arjun Shankar <arjun@redhat.com> - 2.34-63
- s390x: Influence hwcaps/stfle via glibc.cpu.hwcaps tunable (#2169978)