From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id AC652386EC3E for ; Fri, 14 Jan 2022 18:52:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC652386EC3E Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-znnduinXNlaMFUgMGbmKYg-1; Fri, 14 Jan 2022 13:52:05 -0500 X-MC-Unique: znnduinXNlaMFUgMGbmKYg-1 Received: by mail-qk1-f197.google.com with SMTP id br12-20020a05620a460c00b004781fdc9944so8111260qkb.1 for ; Fri, 14 Jan 2022 10:52:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=lwJmRxeQ1BO/W2eNSvKvpkyBnx5tLRw2iD7Ow3VDTe0=; b=PQiFIUSZFwKhrSUDYIWK8/6YgVWCeCtgTy9VxMuJey113dLpUoVp3T8luIY5ORVzKH Ee86UWQK80fXKQpLlWdefVpciuUqpkcrgOiTS3Bfhx1buXREDZ7KFXTRTcqJKhAlFXqV XbiUxLwX51N3mKmBeKiykH2ZgSrKQzGjWP8oVc8rfr281RDA1sLakcZ53R1snJzJFiHE ujJeXx2+wYwk6UCj/Zm99aL5nPkfFQhu0YwSmqhZ2pTMM4iQpC+KskIrjyKSGUyTV7AV CIBf4SaSKUSpL94sU8hGM7HVk6a2PNQrRgR5LlB5SBs5G8eaecEmnPtzVwYAT/O8g0m3 FQ3g== X-Gm-Message-State: AOAM531QCkbMtlOZogrwhLdepMOw9Sm7a3l3fafLQUq6FcPnSsc7dB2h n0Z4WJ2QGCjV682uma1hKU/K6rR5w6bQ7IMzb/pJfe27W5Cp0085s2z6Y39T7gF/VfnmOcEZel2 7LpB5aQNWiAuucg/zJ9bT X-Received: by 2002:a05:6214:2a88:: with SMTP id jr8mr9346511qvb.18.1642186325172; Fri, 14 Jan 2022 10:52:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZfWeJe3BoG/4MkUFUkLB+vwZoCDnE4NoLCtZOKYVs3iDvdSibqNs5ismhWzdfQQRAEyPgLA== X-Received: by 2002:a05:6214:2a88:: with SMTP id jr8mr9346504qvb.18.1642186325028; Fri, 14 Jan 2022 10:52:05 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id u6sm4005224qki.129.2022.01.14.10.52.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 10:52:04 -0800 (PST) Message-ID: <13f60c30-f20e-026c-dac5-b69a0ac151a1@redhat.com> Date: Fri, 14 Jan 2022 13:52:03 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH 6/6] s390x: Use in early HWCAP check To: Florian Weimer , libc-alpha@sourceware.org References: <07f71c2a57d045f20aebc2217a7f7f635785e5f6.1642179009.git.fweimer@redhat.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <07f71c2a57d045f20aebc2217a7f7f635785e5f6.1642179009.git.fweimer@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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-List-Received-Date: Fri, 14 Jan 2022 18:52:08 -0000 On 1/14/22 11:53, Florian Weimer via Libc-alpha wrote: > This is required so that the checks still work if $(early-cflags) > selects a different ISA level. LGTM. No regressions on x86_64 and i686 builders. No CI/CD regressions. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > sysdeps/s390/s390-64/dl-hwcap-check.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > [carlos@athas glibc-pristine]$ grep -rl '__ARCH__' * sysdeps/s390/s390-64/dl-hwcap-check.h Just one file we care about wrapping. > 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 OK. 2 checks need wrapping. > #include > > static inline void > dl_hwcap_check (void) > { > #if defined __ARCH__ > -# if __ARCH__ >= 13 > +# if GCCMACRO__ARCH__ >= 13 OK. 1/2. > 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 OK. 2/2. > if (!(GLRO(dl_hwcap) & HWCAP_S390_VXE)) > _dl_fatal_printf ("\ > Fatal glibc error: CPU lacks VXE support (z14 or later required)\n"); -- Cheers, Carlos.