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 ESMTP id AAB47388CC01 for ; Wed, 21 Apr 2021 09:05:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AAB47388CC01 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-296-5HsIS6xhMS-oKgcdWMj2pw-1; Wed, 21 Apr 2021 05:05:48 -0400 X-MC-Unique: 5HsIS6xhMS-oKgcdWMj2pw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 098401922025; Wed, 21 Apr 2021 09:05:47 +0000 (UTC) Received: from localhost (unknown [10.33.36.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9E7C5C1B4; Wed, 21 Apr 2021 09:05:46 +0000 (UTC) Date: Wed, 21 Apr 2021 10:05:45 +0100 From: Jonathan Wakely To: Jakub Jelinek Cc: Thomas Rodgers , libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org, David Edelsohn Subject: Re: GCC 11.1 Release Candidate available from gcc.gnu.org Message-ID: <20210421090545.GS3008@redhat.com> References: <20210420152439.GR1179226@tucnak> <6ac731c557415b46b04613d9b908df2f@appliantology.com> <45de03629a536c0000c9b47bb79d6601@appliantology.com> <20210421085622.GY1179226@tucnak> MIME-Version: 1.0 In-Reply-To: <20210421085622.GY1179226@tucnak> X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham 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: Wed, 21 Apr 2021 09:06:01 -0000 On 21/04/21 10:56 +0200, Jakub Jelinek via Libstdc++ wrote: >On Tue, Apr 20, 2021 at 10:12:33PM -0700, Thomas Rodgers wrote: >> I think the attached patch (also in BZ) addresses the issue in >> bits/semaphore_base.h, but I'm going to defer to Jonathan on why the macro >> name is being transformed incorrectly in the first place. > >Jonathan's call, but for me it looks much better to fix up the >macro name on the configure side. >The include/Makefile.am sed is: > sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ > -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ > -e 's/VERSION/_GLIBCXX_VERSION/g' \ > -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ > -e 's/_DARWIN_USE_64_BIT_INODE/_GLIBCXX_DARWIN_USE_64_BIT_INODE/g' \ > -e 's/_FILE_OFFSET_BITS/_GLIBCXX_FILE_OFFSET_BITS/g' \ > -e 's/_LARGE_FILES/_GLIBCXX_LARGE_FILES/g' \ > -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ > -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ > -e '/[ ]_GLIBCXX_LONG_DOUBLE_ALT128_COMPAT[ ]/d' \ > < ${CONFIG_HEADER} >> $@ ;\ >so for many macros one needs _GLIBCXX_ prefixes already in configure, >as can be seen in grep AC_DEFINE.*_GLIBCXX configure.ac acinclude.m4 >But _GLIBCXX_HAVE_POSIX_SEMAPHORE is the only one that shouldn't have >that prefix because the sed is adding that. >E.g. on i686-linux, I see >grep _GLIBCXX__GLIBCXX c++config.h >#define _GLIBCXX__GLIBCXX_HAVE_POSIX_SEMAPHORE 1 >that proves it is the only broken one. > >So, I think the right fix is: > >2021-04-21 Jakub Jelinek > > PR libstdc++/100164 > * acinclude.m4: For POSIX semaphores AC_DEFINE HAVE_POSIX_SEMAPHORE > rather than _GLIBCXX_HAVE_POSIX_SEMAPHORE. > * configure: Regenerated. > * config.h.in: Regenerated. > >--- libstdc++-v3/acinclude.m4.jj 2020-12-16 14:42:46.501084530 +0100 >+++ libstdc++-v3/acinclude.m4 2021-04-21 10:51:52.450419650 +0200 >@@ -4097,7 +4097,7 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ > [ac_have_posix_semaphore=no]) > > if test $ac_have_posix_semaphore = yes ; then >- AC_DEFINE(_GLIBCXX_HAVE_POSIX_SEMAPHORE, >+ AC_DEFINE(HAVE_POSIX_SEMAPHORE, > 1, > [Define to 1 if POSIX Semaphores with sem_timedwait are available in .]) > fi Yes, this is correct. Please push.