From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.eu.adacore.com (mel.act-europe.fr [194.98.77.210]) by sourceware.org (Postfix) with ESMTPS id 75813385042D for ; Sun, 7 Mar 2021 18:20:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 75813385042D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=charlet@eu.adacore.com Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 3556A823DE; Sun, 7 Mar 2021 19:20:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id faVOAccoIBWb; Sun, 7 Mar 2021 19:20:23 +0100 (CET) Received: from chelles.localdomain (chelles.act-europe.fr [IPv6:2a02:2ab8:224:1:d6be:d9ff:fef8:4565]) by smtp.eu.adacore.com (Postfix) with ESMTP id F13C0823C3; Sun, 7 Mar 2021 19:20:22 +0100 (CET) Received: by chelles.localdomain (Postfix, from userid 525) id EC65D1EA007F; Sun, 7 Mar 2021 19:20:22 +0100 (CET) Date: Sun, 7 Mar 2021 19:20:22 +0100 From: Arnaud Charlet To: Mikael Pettersson Cc: GCC Patches , Arnaud Charlet Subject: Re: [PATCH v2] fix Ada bootstrap on Cygwin64 (PR bootstrap/94918) Message-ID: <20210307182022.GA31210@adacore.com> References: <20210110105700.GA22908@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2021 18:20:25 -0000 > > > > This fixes a compilation error preventing bootstrap with Ada on > > > > x86_64-pc-cygwin. See PR bootstrap/94918 for details. > > > > > > > > Compared to the initial patch sent in May 2020, this v2 patch places > > > > the fix in Ada's raise-gcc.c instead of the shared unwind-generic.h, > > > > which should hopefully simplify getting it applied. > > > > > > Not sure why. Applying it there looks incomplete and kludgy, don't you > > > agree? > > > > Ok, then here's v3 which places the fix in unwind-generic.h. The fix > > matches what Ada's mingw32.h does. > > > > Tested by bootstrapping this and the preliminary workaround for > > PR98590 on x86_64-pc-cygwin. > > > > Ok for master and branches? > > Ping. This is currently the only blocker for bootstrapping gcc-11 with > Ada on Cygwin64. Unfortunately changes in libgcc are outside my area, you'll need to find another maintainer for this one. > > libgcc/ > > > > 2021-01-10 Mikael Pettersson > > > > PR bootstrap/94918 > > * unwind-generic.h (__SEH__): Prevent windows.h from including > > x86intrin.h or emmintrin.h on Cygwin64. > > > > --- gcc-11-20210103/libgcc/unwind-generic.h.~1~ 2021-01-03 > > 23:32:20.000000000 +0100 > > +++ gcc-11-20210103/libgcc/unwind-generic.h 2021-01-09 > > 14:51:16.262378715 +0100 > > @@ -30,6 +30,12 @@ > > > > #if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) > > /* Only for _GCC_specific_handler. */ > > +#if defined (__CYGWIN__) && !defined (__CYGWIN32__) && !defined (IN_RTS) > > +/* Note: windows.h on cygwin-64 includes x86intrin.h which uses malloc. > > + That fails to compile, if malloc is poisoned, i.e. if !IN_RTS. */ > > +#define _X86INTRIN_H_INCLUDED > > +#define _EMMINTRIN_H_INCLUDED > > +#endif > > #include > > #endif >