From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from confino.investici.org (confino.investici.org [IPv6:2a11:7980:1::2:0]) by sourceware.org (Postfix) with ESMTPS id 2E7553858284; Sat, 24 Dec 2022 15:42:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2E7553858284 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=autistici.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=autistici.org Received: from 1.mail-backend.investici.org (unknown [10.0.0.11]) by confino.investici.org (Postfix) with ESMTP id 4NfSwY0L1hz111N; Sat, 24 Dec 2022 15:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1671896541; bh=il05Xj4+bZSyeIkeoPWOeZna6cwbOZE7vcxctQ3xKz4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ia+/74oG4rMTUyX/BdWccRmVRXpwtGQVQtfQKYjaRoGP2bVUgeMD8qDatETCGLpr8 2d8MCfsCm+e4dXie1O6V9xAZpOztJMOA8OhIPobgbrtCRqGNikWXlUeKjO5JUYj51g 1JQAYRcCil5wD7yOWW9T7NKuhO0SuR8Ms/e8d30I= Received: from 1.webmail.investici.org (localhost [127.0.0.1]) (Authenticated sender: i.nixman@autistici.org) by 1.mail-backend.investici.org (Postfix) with ESMTPA id 4NfSwX5qjcz61Qf; Sat, 24 Dec 2022 15:42:20 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 24 Dec 2022 15:42:20 +0000 From: i.nixman@autistici.org To: Jonathan Yong <10walls@gmail.com> Cc: fortran@gcc.gnu.org, libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: Adding a new thread model to GCC In-Reply-To: References: <0f1f223a-3756-1da3-bd1d-b87edd34e1f9@126.com> <21655510.EfDdHjke4D@fomalhaut> <2092961.OBFZWjSADL@fomalhaut> <45c84c01-74ca-3739-6482-2bbc94de0e9a@gmail.com> <00af136c637f5231670c0fb6f7906d42@autistici.org> User-Agent: Roundcube Webmail Message-ID: <2e01c62df7c121203d800347a7c23144@autistici.org> X-Sender: i.nixman@autistici.org Content-Type: multipart/mixed; boundary="=_81d1216cd149a1c521613e26ad8dffcc" X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=_81d1216cd149a1c521613e26ad8dffcc Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-12-24 13:50, i.nixman@autistici.org wrote: > On 2022-12-24 05:58, NightStrike wrote: >> >> I think this might have broken fortran. I'm assuming because the >> backtrace includes gthr.h, and I just did a git pull: >> >> In file included from /tmp/rtmingw/mingw/include/windows.h:71, >> from ../libgcc/gthr-default.h:606, >> from ../../../libgfortran/../libgcc/gthr.h:148, >> from ../../../libgfortran/io/io.h:33, >> from ../../../libgfortran/runtime/error.c:27: >> ../../../libgfortran/io/io.h:298:24: error: expected identifier before >> numeric constant >> 298 | { CC_LIST, CC_FORTRAN, CC_NONE, >> | ^~~~~~~ > > > yes, you are right! > this is because the `CC_NONE` was previously defined in `wingdi.h` as > `#define CC_NONE 0` > > thinking... fixed and tested. Jonathan Yong, could you please apply the attached patch too? kings regards! --=_81d1216cd149a1c521613e26ad8dffcc Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=cc_none-in-libgfortran-conflict.patch Content-Disposition: attachment; filename=cc_none-in-libgfortran-conflict.patch; size=574 ZGlmZiAtLWdpdCBhL2xpYmdjYy9jb25maWcvaTM4Ni9ndGhyLXdpbjMyLmggYi9saWJnY2MvY29u ZmlnL2kzODYvZ3Roci13aW4zMi5oCmluZGV4IDk0ODVkZDUwYmY5Li4yYjViNzgyYzg5NCAxMDA2 NDQKLS0tIGEvbGliZ2NjL2NvbmZpZy9pMzg2L2d0aHItd2luMzIuaAorKysgYi9saWJnY2MvY29u ZmlnL2kzODYvZ3Roci13aW4zMi5oCkBAIC05Myw4ICs5Myw5IEBAIHNlZSB0aGUgZmlsZXMgQ09Q WUlORzMgYW5kIENPUFlJTkcuUlVOVElNRSByZXNwZWN0aXZlbHkuICBJZiBub3QsIHNlZQogI2Vu ZGlmCiAjZGVmaW5lIFdJTjMyX0xFQU5fQU5EX01FQU4KICNpbmNsdWRlIDx3aW5kb3dzLmg+Ci0v KiBOb3cgdW5kZWYgdGhlIHdpbmRvd3MgQk9PTC4gICovCisvKiBOb3cgdW5kZWYgdGhlIHdpbmRv d3MgQk9PTCBhbmQgQ0NfTk9ORSAqLwogI3VuZGVmIEJPT0wKKyN1bmRlZiBDQ19OT05FCiAKIC8q IEtleSBzdHJ1Y3R1cmUgZm9yIG1haW50YWluaW5nIHRocmVhZCBzcGVjaWZpYyBzdG9yYWdlICov CiBzdGF0aWMgRFdPUkQgX19ndGhyZWFkX29iamNfZGF0YV90bHMgPSBUTFNfT1VUX09GX0lOREVY RVM7Cg== --=_81d1216cd149a1c521613e26ad8dffcc--