From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Cc: Stefan Liebler <stli@linux.ibm.com>
Subject: [PATCH 7/7] s390x: Use <gcc-macros.h> in early HWCAP check
Date: Fri, 14 Jan 2022 13:41:10 +0100 [thread overview]
Message-ID: <201e517c6a751bebe505af99e35a9f8643066f31.1642162312.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1642162312.git.fweimer@redhat.com>
This is required so that the checks still work if $(early-cflags)
selects a different ISA level.
---
sysdeps/s390/s390-64/dl-hwcap-check.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sysdeps/s390/s390-64/dl-hwcap-check.h b/sysdeps/s390/s390-64/dl-hwcap-check.h
index 53e02250b8..f769932325 100644
--- a/sysdeps/s390/s390-64/dl-hwcap-check.h
+++ b/sysdeps/s390/s390-64/dl-hwcap-check.h
@@ -19,17 +19,18 @@
#ifndef _DL_HWCAP_CHECK_H
#define _DL_HWCAP_CHECK_H
+#include <gcc-macros.h>
#include <ldsodefs.h>
static inline void
dl_hwcap_check (void)
{
#if defined __ARCH__
-# if __ARCH__ >= 13
+# if GCCMACRO__ARCH__ >= 13
if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_EXT2))
_dl_fatal_printf ("\
Fatal glibc error: CPU lacks VXRS_EXT2 support (z15 or later required)\n");
-# elif __ARCH__ >= 12
+# elif GCCMACRO__ARCH__ >= 12
if (!(GLRO(dl_hwcap) & HWCAP_S390_VXE))
_dl_fatal_printf ("\
Fatal glibc error: CPU lacks VXE support (z14 or later required)\n");
--
2.34.1
next prev parent reply other threads:[~2022-01-14 12:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 12:40 [PATCH 0/7] Reliable CPU compatibility diagnostics in ld.so Florian Weimer
2022-01-14 12:40 ` [PATCH 1/7] x86: HAVE_X86_LAHF_SAHF, HAVE_X86_MOVBE and -march=x86-64-vN (bug 28782) Florian Weimer
2022-01-14 14:21 ` H.J. Lu
2022-01-14 12:40 ` [PATCH 2/7] Generate gcc-macros.h Florian Weimer
2022-01-14 14:24 ` H.J. Lu
2022-01-14 12:40 ` [PATCH 3/7] elf: Split dl-printf.c from dl-misc.c Florian Weimer
2022-01-14 14:25 ` H.J. Lu
2022-01-14 14:27 ` Florian Weimer
2022-01-14 14:32 ` H.J. Lu
2022-01-14 12:40 ` [PATCH 4/7] Add --early-cflags configure option Florian Weimer
2022-01-14 14:27 ` H.J. Lu
2022-01-14 14:29 ` Florian Weimer
2022-01-14 14:33 ` H.J. Lu
2022-01-14 14:34 ` Florian Weimer
2022-01-14 12:40 ` [PATCH 5/7] powerpc64le: Use <gcc-macros.h> in early HWCAP check Florian Weimer
2022-01-14 12:41 ` [PATCH 6/7] x86: Add x86-64-vN check to early startup Florian Weimer
2022-01-14 12:41 ` Florian Weimer [this message]
2022-01-18 12:42 ` [PATCH 7/7] s390x: Use <gcc-macros.h> in early HWCAP check Stefan Liebler
2022-01-18 12:54 ` Florian Weimer
2022-01-18 13:31 ` Stefan Liebler
2022-01-18 13:33 ` Florian Weimer
2022-01-18 13:38 ` Stefan Liebler
2022-01-18 21:03 ` Joseph Myers
2022-01-18 21:21 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201e517c6a751bebe505af99e35a9f8643066f31.1642162312.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=stli@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).