You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.0 KiB
53 lines
2.0 KiB
2 years ago
|
commit 550116486692efc394d03befee19f7e9c17d5044
|
||
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Fri Jan 14 20:16:05 2022 +0100
|
||
|
|
|
||
|
|
powerpc64le: 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>
|
||
|
|
|
||
|
|
diff --git a/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h b/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h
|
||
|
|
index 0437ae4d522fb36d..899c74f880e6f5f0 100644
|
||
|
|
--- a/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h
|
||
|
|
+++ b/sysdeps/powerpc/powerpc64/le/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)
|
||
|
|
{
|
||
|
|
-#ifdef _ARCH_PWR9
|
||
|
|
+#ifdef GCCMACRO_ARCH_PWR9
|
||
|
|
if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_00) == 0)
|
||
|
|
_dl_fatal_printf ("\
|
||
|
|
Fatal glibc error: CPU lacks ISA 3.00 support (POWER9 or later required)\n");
|
||
|
|
#endif
|
||
|
|
-#ifdef __FLOAT128_HARDWARE__
|
||
|
|
+#ifdef GCCMACRO__FLOAT128_HARDWARE__
|
||
|
|
if ((GLRO (dl_hwcap2) & PPC_FEATURE2_HAS_IEEE128) == 0)
|
||
|
|
_dl_fatal_printf ("\
|
||
|
|
Fatal glibc error: CPU lacks float128 support (POWER 9 or later required)\n");
|
||
|
|
@@ -37,12 +38,12 @@ Fatal glibc error: CPU lacks float128 support (POWER 9 or later required)\n");
|
||
|
|
/* This check is not actually reached when building for POWER10 and
|
||
|
|
running on POWER9 because there are faulting PCREL instructions
|
||
|
|
before this point. */
|
||
|
|
-#if defined _ARCH_PWR10 || defined __PCREL__
|
||
|
|
+#if defined GCCMACRO_ARCH_PWR10 || defined GCCMACRO__PCREL__
|
||
|
|
if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_1) == 0)
|
||
|
|
_dl_fatal_printf ("\
|
||
|
|
Fatal glibc error: CPU lacks ISA 3.10 support (POWER10 or later required)\n");
|
||
|
|
#endif
|
||
|
|
-#ifdef __MMA__
|
||
|
|
+#ifdef GCCMACRO__MMA__
|
||
|
|
if ((GLRO (dl_hwcap2) & PPC_FEATURE2_MMA) == 0)
|
||
|
|
_dl_fatal_printf ("\
|
||
|
|
Fatal glibc error: CPU lacks MMA support (POWER10 or later required)\n");
|