s390x: Use <gcc-macros.h> in early HWCAP check

This is required so that the checks still work if $(early-cflags)
selects a different ISA level.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer 2022-01-14 20:16:05 +01:00
parent 990c953bce
commit f01d482f03

View File

@ -19,17 +19,18 @@
#ifndef _DL_HWCAP_CHECK_H #ifndef _DL_HWCAP_CHECK_H
#define _DL_HWCAP_CHECK_H #define _DL_HWCAP_CHECK_H
#include <gcc-macros.h>
#include <ldsodefs.h> #include <ldsodefs.h>
static inline void static inline void
dl_hwcap_check (void) dl_hwcap_check (void)
{ {
#if defined __ARCH__ #if defined __ARCH__
# if __ARCH__ >= 13 # if GCCMACRO__ARCH__ >= 13
if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_EXT2)) if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_EXT2))
_dl_fatal_printf ("\ _dl_fatal_printf ("\
Fatal glibc error: CPU lacks VXRS_EXT2 support (z15 or later required)\n"); 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)) if (!(GLRO(dl_hwcap) & HWCAP_S390_VXE))
_dl_fatal_printf ("\ _dl_fatal_printf ("\
Fatal glibc error: CPU lacks VXE support (z14 or later required)\n"); Fatal glibc error: CPU lacks VXE support (z14 or later required)\n");