From patchwork Fri Jan 14 16:53:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 50042 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1F47B383603F for ; Fri, 14 Jan 2022 16:55:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F47B383603F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1642179326; bh=G8t//5polw7uErk86PPpTJpxraSFj9fdnjq4Plq7Zbo=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=iZMHZ1QgdX5J4LlBWJqfMESqdmv2VZS4W5w5AhEBsHPVhwQlooS6n5iGCRpbVZy1O S9zps/sj7S98eQG54KpnVDUpKm3wBeTQprklhnfhrNYJaRaBF3tpA+OtZoIG8tkOyK pdB44Hs+O9XIPYgSClLgAh5G0IM1It2PlKhwROAA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 88664385DC11 for ; Fri, 14 Jan 2022 16:53:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 88664385DC11 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-199-_Ki4hvhVMv2dQmPr3-WVFA-1; Fri, 14 Jan 2022 11:53:12 -0500 X-MC-Unique: _Ki4hvhVMv2dQmPr3-WVFA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47CE783DD23 for ; Fri, 14 Jan 2022 16:53:11 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A125C7A3F5 for ; Fri, 14 Jan 2022 16:53:10 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v2 4/6] powerpc64le: Use in early HWCAP check In-Reply-To: References: X-From-Line: 7540e03f5d1e4f301d53f755307d12f67eb17b0b Mon Sep 17 00:00:00 2001 Message-Id: <7540e03f5d1e4f301d53f755307d12f67eb17b0b.1642179009.git.fweimer@redhat.com> Date: Fri, 14 Jan 2022 17:53:08 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is required so that the checks still work if $(early-cflags) selects a different ISA level. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h b/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h index 713a7f0313..b43c182683 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 #include 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");