From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id 1E725385802B for ; Sun, 10 Jan 2021 10:44:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1E725385802B Received: by mail-ot1-x333.google.com with SMTP id d8so14178808otq.6 for ; Sun, 10 Jan 2021 02:44:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=VY0UueIt7KcPQtFeS4Inj69DTr6ZkY7sZMkfUg0LT1s=; b=Y551MzT3YMUUQYa/f0fW10U8AdIJMv5ejnO0nasJ44lpvpsGnkoZtPn0VNxTs56NLK NAE5y6XgiS4GDy3339tLsKEpFK/yVXPuqzVYKW+3D9gOuJvVqWVH2km7C9VsfXcyGcDl zowpQNgBn9GYG/rg0uI2jwU71CsqVaGHJvfaxagyidwbpaY290SW+105Q7vvTmG/KzEG jkLjbknhv8uyYYUqh5rGmQscAoQVsMH5+G8ZAaWuiP5fMAs/3NUDXFgphAp+AOPLVzKc zIJ/1ioXjP68S/y6mtmdeBrfXx9IYD998qZkf9W9aiLfb4aJLDb3bBjju7QZI/IbuMlT W+iw== X-Gm-Message-State: AOAM533ArrCTDn2s0HgYuiwiHQc1p8HwGuLRNDlPyqUQHS7bqL5w2fy1 Fh9imypZmA2QOGRfY8TxRDNPWG25S7YieMIccN0WtVXZD5PgSw== X-Google-Smtp-Source: ABdhPJyeYwOFlSzbO7tfnLdMHyYVDBHXKfpg8FtmeMt6xTIcG8WVa4+vAWAqagXyd9H+ERtAuq+2qLnJspdLtYoeCgU= X-Received: by 2002:a9d:3b1:: with SMTP id f46mr8219047otf.370.1610275464246; Sun, 10 Jan 2021 02:44:24 -0800 (PST) MIME-Version: 1.0 From: Mikael Pettersson Date: Sun, 10 Jan 2021 11:44:12 +0100 Message-ID: Subject: [PATCH v2] fix Ada bootstrap on Cygwin64 (PR bootstrap/94918) To: GCC Patches Content-Type: multipart/mixed; boundary="00000000000009ac7405b889792f" X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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, 10 Jan 2021 10:44:26 -0000 --00000000000009ac7405b889792f Content-Type: text/plain; charset="UTF-8" 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. Tested by bootstrapping this and the preliminary workaround for PR98590 on x86_64-pc-cygwin. Ok for master and branches? (Patch also attached to protect it against gmail formatting.) gcc/ada/ 2021-01-10 Mikael Pettersson PR bootstrap/94918 * raise-gcc.c: (__SEH__): Prevent windows.h from including x86intrin.h or emmintrin.h on Cygwin64. --- gcc-11-20210103/gcc/ada/raise-gcc.c.~1~ 2021-01-03 23:32:14.000000000 +0100 +++ gcc-11-20210103/gcc/ada/raise-gcc.c 2021-01-10 11:13:07.878685936 +0100 @@ -79,6 +79,15 @@ typedef char bool; (SJLJ or DWARF). We need a consistently named interface to import from a-except, so wrappers are defined here. */ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) && \ + defined (__CYGWIN__) && !defined (__CYGWIN32__) && !defined (IN_RTS) +/* Note: windows.h (via unwind-generic.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 + #ifndef IN_RTS /* For gnat1/gnatbind compilation: cannot use unwind.h, as it is for the target. So mimic configure... --00000000000009ac7405b889792f Content-Type: text/x-patch; charset="US-ASCII"; name="gcc-11-20210103-ada-cygwin-pr94918.patch" Content-Disposition: attachment; filename="gcc-11-20210103-ada-cygwin-pr94918.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kjr0dqts0 Z2NjL2FkYS8KCjIwMjEtMDEtMTAgIE1pa2FlbCBQZXR0ZXJzc29uICA8bWlrcGVsaW51eEBnbWFp bC5jb20+CgoJUFIgYm9vdHN0cmFwLzk0OTE4CgkqIHJhaXNlLWdjYy5jOiAoX19TRUhfXyk6IFBy ZXZlbnQgd2luZG93cy5oIGZyb20gaW5jbHVkaW5nCgl4ODZpbnRyaW4uaCBvciBlbW1pbnRyaW4u aCBvbiBDeWd3aW42NC4KCi0tLSBnY2MtMTEtMjAyMTAxMDMvZ2NjL2FkYS9yYWlzZS1nY2MuYy5+ MX4JMjAyMS0wMS0wMyAyMzozMjoxNC4wMDAwMDAwMDAgKzAxMDAKKysrIGdjYy0xMS0yMDIxMDEw My9nY2MvYWRhL3JhaXNlLWdjYy5jCTIwMjEtMDEtMTAgMTE6MTM6MDcuODc4Njg1OTM2ICswMTAw CkBAIC03OSw2ICs3OSwxNSBAQCB0eXBlZGVmIGNoYXIgYm9vbDsKICAgIChTSkxKIG9yIERXQVJG KS4gV2UgbmVlZCBhIGNvbnNpc3RlbnRseSBuYW1lZCBpbnRlcmZhY2UgdG8gaW1wb3J0IGZyb20K ICAgIGEtZXhjZXB0LCBzbyB3cmFwcGVycyBhcmUgZGVmaW5lZCBoZXJlLiAgKi8KIAorI2lmIGRl ZmluZWQgKF9fU0VIX18pICYmICFkZWZpbmVkIChfX1VTSU5HX1NKTEpfRVhDRVBUSU9OU19fKSAm JiBcCisgICAgZGVmaW5lZCAoX19DWUdXSU5fXykgJiYgIWRlZmluZWQgKF9fQ1lHV0lOMzJfXykg JiYgIWRlZmluZWQgKElOX1JUUykKKy8qIE5vdGU6IHdpbmRvd3MuaCAodmlhIHVud2luZC1nZW5l cmljLmgpIG9uIGN5Z3dpbi02NCBpbmNsdWRlcyB4ODZpbnRyaW4uaAorICAgd2hpY2ggdXNlcyBt YWxsb2MuIFRoYXQgZmFpbHMgdG8gY29tcGlsZSBpZiBtYWxsb2MgaXMgcG9pc29uZWQsIGkuZS4g aWYKKyAgICFJTl9SVFMuICAqLworI2RlZmluZSBfWDg2SU5UUklOX0hfSU5DTFVERUQKKyNkZWZp bmUgX0VNTUlOVFJJTl9IX0lOQ0xVREVECisjZW5kaWYKKwogI2lmbmRlZiBJTl9SVFMKICAgLyog Rm9yIGduYXQxL2duYXRiaW5kIGNvbXBpbGF0aW9uOiBjYW5ub3QgdXNlIHVud2luZC5oLCBhcyBp dCBpcyBmb3IgdGhlCiAgICAgIHRhcmdldC4gU28gbWltaWMgY29uZmlndXJlLi4uCg== --00000000000009ac7405b889792f--