From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 6DD4A3850406 for ; Fri, 5 Feb 2021 13:49:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6DD4A3850406 Received: by mail-oi1-x22c.google.com with SMTP id w8so7469140oie.2 for ; Fri, 05 Feb 2021 05:49:16 -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:references:in-reply-to:from:date :message-id:subject:to:cc; bh=k48ZPqduF/0c7CkGNCAwZYV2eFnr5d4gAavgoAK2ZA0=; b=al3FI1V3w8fBN5sjTzeFAUxz08Lmebc7ERvRxws+WPfO41wn2di2bd31MXiVdvq7b1 ZCnCPWiEz0PuKQlDppYvzOu+PgwvbR1N+glyWoIUqAtSP1L/YzEa9Z5la295aQOTq2G8 /se5QIRjulKbP8XuCefr71k+NDeJ0TxaZ44FC5u5CfexFrUtKB/mu33Qvm8NQ+vedjWx +P1+bR/xfIRADdRTeQY2JUO268MCfOz+/xfihFYchanM5WYtfz//4dEUp33n5a1S0AE5 SNv+ra9RXcgXvoqf232xsmLhAmrjwY/XqVkfoJWw2yNkPHw9KCFDxhICDSu42CarmA5I hpdg== X-Gm-Message-State: AOAM533MMi6+O08XeNNc6K2mjRLV2O3klt07PAXXh+1bGtPToSTbKQIh gpObpCE/5Euoaow6cMVzPxPnrKYW/NAx35M/pds= X-Google-Smtp-Source: ABdhPJzABnzNZfF+k7jxDxVsygGZsF0m8uHT8ZWQSNLl5zX8ULjn4ESefboe4lb6Vq4K9Uj7cD9kyX7UgV9Pv14Uqo8= X-Received: by 2002:a05:6808:b03:: with SMTP id s3mr3087008oij.40.1612532955816; Fri, 05 Feb 2021 05:49:15 -0800 (PST) MIME-Version: 1.0 References: <20210205083527.GA6784@adacore.com> In-Reply-To: <20210205083527.GA6784@adacore.com> From: Mikael Pettersson Date: Fri, 5 Feb 2021 14:49:03 +0100 Message-ID: Subject: Re: [PATCH] Fix Ada bootstrap failure on Cygwin since switch to C++11 (PR98590) To: Arnaud Charlet Cc: GCC Patches Content-Type: multipart/mixed; boundary="00000000000005d9e605ba97168c" X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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: Fri, 05 Feb 2021 13:49:17 -0000 --00000000000005d9e605ba97168c Content-Type: text/plain; charset="UTF-8" On Fri, Feb 5, 2021 at 9:35 AM Arnaud Charlet wrote: > > > This fixes the bootstrap failure with Ada on Cygwin since the switch > > to C++11. The configure checks detect that fileno_unlocked () is > > present, but when Ada's cstreams.c is compiled in C++11 mode, > > does not declare it, causing a hard error. > > > > Fixed by defining _GNU_SOURCE before including . > > > > Ok for the master branch? > > > > gcc/ada/ > > > > 2021-02-03 Mikael Pettersson > > > > PR bootstrap/98590 > > * cstreams.c: Ensure fileno_unlocked() is visible on Cygwin. > > We'd rather not have PR references in the source files, so please remove it > (it will be there as part of the commit log and git annotate). > > OK with the comment updated. Thanks, here's the revised patch. gcc/ada/ 2021-02-05 Mikael Pettersson PR bootstrap/98590 * cstreams.c: Ensure fileno_unlocked() is visible on Cygwin. diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c index 4e00dedbbd6..7d64277110b 100644 --- a/gcc/ada/cstreams.c +++ b/gcc/ada/cstreams.c @@ -37,6 +37,11 @@ #define _FILE_OFFSET_BITS 64 /* the define above will make off_t a 64bit type on GNU/Linux */ +/* tell Cygwin's to expose fileno_unlocked() */ +#if defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(_GNU_SOURCE) +#define _GNU_SOURCE +#endif + #include #include #include --00000000000005d9e605ba97168c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Ensure-fileno_unlocked-is-visible-on-Cygwin.patch" Content-Disposition: attachment; filename="0001-Ensure-fileno_unlocked-is-visible-on-Cygwin.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kkscg3s80 RnJvbSBmOWI5YjQ0ZjUzNDFiMGQ4ZGY3YjFiYjAwZGU2ZjcyMzEyNTg4OTFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWthZWwgUGV0dGVyc3NvbiA8bWlrcGVsaW51eEBnbWFpbC5j b20+CkRhdGU6IEZyaSwgNSBGZWIgMjAyMSAxNDo0Mzo1MiArMDEwMApTdWJqZWN0OiBbUEFUQ0hd IEVuc3VyZSBmaWxlbm9fdW5sb2NrZWQoKSBpcyB2aXNpYmxlIG9uIEN5Z3dpbi4KCi0tLQogZ2Nj L2FkYS9jc3RyZWFtcy5jIHwgNSArKysrKwogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2djYy9hZGEvY3N0cmVhbXMuYyBiL2djYy9hZGEvY3N0cmVhbXMuYwpp bmRleCA0ZTAwZGVkYmJkNi4uN2Q2NDI3NzExMGIgMTAwNjQ0Ci0tLSBhL2djYy9hZGEvY3N0cmVh bXMuYworKysgYi9nY2MvYWRhL2NzdHJlYW1zLmMKQEAgLTM3LDYgKzM3LDExIEBACiAjZGVmaW5l IF9GSUxFX09GRlNFVF9CSVRTIDY0CiAvKiB0aGUgZGVmaW5lIGFib3ZlIHdpbGwgbWFrZSBvZmZf dCBhIDY0Yml0IHR5cGUgb24gR05VL0xpbnV4ICovCiAKKy8qIHRlbGwgQ3lnd2luJ3MgPHN0ZGlv Lmg+IHRvIGV4cG9zZSBmaWxlbm9fdW5sb2NrZWQoKSAqLworI2lmIGRlZmluZWQoX19DWUdXSU5f XykgJiYgIWRlZmluZWQoX19DWUdXSU4zMl9fKSAmJiAhZGVmaW5lZChfR05VX1NPVVJDRSkKKyNk ZWZpbmUgX0dOVV9TT1VSQ0UKKyNlbmRpZgorCiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRl IDxzeXMvdHlwZXMuaD4KICNpbmNsdWRlIDxzeXMvc3RhdC5oPgotLSAKMi4yNi4yCgo= --00000000000005d9e605ba97168c--