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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 332003833016 for ; Thu, 26 Nov 2020 22:57:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 332003833016 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-423-jJK3dBi1PsazXzaLK83t2A-1; Thu, 26 Nov 2020 17:56:37 -0500 X-MC-Unique: jJK3dBi1PsazXzaLK83t2A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0147A1E7DD; Thu, 26 Nov 2020 22:56:36 +0000 (UTC) Received: from localhost (unknown [10.33.37.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D8BD60855; Thu, 26 Nov 2020 22:56:35 +0000 (UTC) Date: Thu, 26 Nov 2020 22:56:34 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [committed] libstdc++: Add "futex" and "gthreads" effective-target keywords Message-ID: <20201126225634.GO1312820@redhat.com> References: <20201126162504.GA2154347@redhat.com> <20201126171033.GM1312820@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201126171033.GM1312820@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="s3R87C3fwYeCSZ0b" Content-Disposition: inline X-Spam-Status: No, score=-14.0 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 22:57:16 -0000 --s3R87C3fwYeCSZ0b Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline On 26/11/20 17:10 +0000, Jonathan Wakely wrote: >On 26/11/20 16:25 +0000, Jonathan Wakely wrote: >>+# Return 1 if futex syscall is available >>+proc check_effective_target_gthreads { } { >>+ return [check_v3_target_gthreads_timed] > >Oops, I've just noticed the comment is wrong and this calls the wrong >proc. It should be check_v3_target_gthreads not >check_v3_target_gthreads_timed. > >I'm in the process of refactoring it anyway so will fix it. The refactoring is gling slowly, so here the fix. Tested powerpc64le-linux. Committed to trunk. --s3R87C3fwYeCSZ0b Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 1a00786414c7ee2f228562fab5c43491a13284c1 Author: Jonathan Wakely Date: Thu Nov 26 21:41:15 2020 libstc++: Fix typo in new check_effective_target_gthreads proc Also fix copy&pasted comments referring to the wrong things. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (check_effective_target_gthreads): Call check_v3_target_gthreads not check_v3_target_gthreads_timed. diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index bde8cc0cc91f..b94116ff4ea5 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1619,7 +1619,8 @@ proc check_effective_target_tbb-backend { } { # Return 1 if futex syscall is available proc check_effective_target_futex { } { return [check_v3_target_prop_cached et_futex { - # Set up and compile a C++ test program that depends on tbb + # Set up and compile a C++ test program that depends on futex + # being supported. set src futex[pid].cc set exe futex[pid].x @@ -1643,9 +1644,10 @@ proc check_effective_target_futex { } { }] } -# Return 1 if futex syscall is available +# Return 1 if C++11 [threads] facilities are available via gthreads, +# 0 otherwise. proc check_effective_target_gthreads { } { - return [check_v3_target_gthreads_timed] + return [check_v3_target_gthreads] } set additional_prunes "" --s3R87C3fwYeCSZ0b--