From nobody Fri Oct 06 17:54:02 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S2GJV5qVlz4w0yW; Fri, 6 Oct 2023 17:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S2GJV5LFXz4fX2; Fri, 6 Oct 2023 17:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696614842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Laod4MWBHnhQOOy1afmXZgvO3PC3tWCPiCrTRCT1Rig=; b=fcTfpqfJ8t9lZ6xE85gGGuWAoDq+9pS0WbbjcjMJ9LiA2stPTfYzvl4p7XSB0OCesxC/IP p7dQun0kySYurb4Dhdaroh1lB9jLJcOcWYsikFK3FLfQPkEkYfNDRqmZh72PvHqpRCE8lP XfxdaZjSta0VvyzU4jkldFV3vilcYm++ysRNmObNzDdqg1evpTmucN7pYtx47SF0rlWx5v R88yVPx5clejDm83Fun92cCmkHZzH+7iTIXml2Rf+8ZI5c3jgXeYA23lFMYtwoxhdQdeqk aDzf/92kP0qp4bfIoN++ETPpXCRnUlH3FaVGvKxg571KxM9hnm3KzioBUPh4xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696614842; a=rsa-sha256; cv=none; b=R/DtHRDV4umuFrjFMQbZ5qbEycTWCMULoTpofd7h/RW4KJtQgVAtph+GU6ke8iYU+OjNzQ jHgKe8K8IPCG06rlPLxIVbfh357c7BGvn4CsSgmIwptdWbQUxhtL3LwcwqBldzGh0RKctT 4jMY5NO7N3tjVv066+Hp3chX60N6Y4R5oOVNGXnwPn9RxyaQYyiRSBKb+ex5od1TGbX9rr k+N/mQl1ZtoXAHSsoAnbczzWWZpKjPiNMNVPf4w3C1QUiePoKV+aB+dFdNSaVpU3oCw4xj Bn2LYQHcj7SxvdP4hGraGGk+B2TVpbwoLd+IB/P6UQ7o3QDFfscJIGadWN6fGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696614842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Laod4MWBHnhQOOy1afmXZgvO3PC3tWCPiCrTRCT1Rig=; b=p8j5nU7x2+DM7+aCgmcdrTF0GlOosTJ/jvOq9n4TTR0nxHcdNyfc0GWZIsGpVJras0X3y4 lqKA87gat6a73gRhyr4RdDdyhG4OG00oL13/Kd0O/d7CJvTbZ9K7P+7BZbVYw6N8J2nNYc /8+Y6a7aFneC05XRip6F9AnEfW3cYBV38xlBFMWpqHN+Rg//2GD9bJpnx2ye56BR6d4tjR uJXFssOo5WzZrO4qPXx8ssYhguVKlMzU14fSUarshcsILDbK8GWykvU8Ex7kK9Di92wpqU 0KUDtrUTCcebk161/IvLTOEwmKD6yNn8dN6ECIVTn5c+f/m0AEHIGoRlNXA28A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S2GJV4QWrzy0Y; Fri, 6 Oct 2023 17:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396Hs2Ax044321; Fri, 6 Oct 2023 17:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396Hs2Nf044318; Fri, 6 Oct 2023 17:54:02 GMT (envelope-from git) Date: Fri, 6 Oct 2023 17:54:02 GMT Message-Id: <202310061754.396Hs2Nf044318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: e0a6f0f30351 - main - devel/gcc-arm-embedded: fix build with libc++ 17 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0a6f0f30351d02a0417b40f9ce7d7e135438c03 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0a6f0f30351d02a0417b40f9ce7d7e135438c03 commit e0a6f0f30351d02a0417b40f9ce7d7e135438c03 Author: Dimitry Andric AuthorDate: 2023-09-21 19:08:54 +0000 Commit: Dimitry Andric CommitDate: 2023-10-06 17:52:52 +0000 devel/gcc-arm-embedded: fix build with libc++ 17 When building relatively recent gcc ports (with C++ in them) against libc++ 17, you get errors similar to: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/cp/module.cc:208: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/system.h:239: In file included from /usr/include/c++/v1/vector:321: In file included from /usr/include/c++/v1/__format/formatter_bool.h:20: In file included from /usr/include/c++/v1/__format/formatter_integral.h:32: In file included from /usr/include/c++/v1/locale:202: /usr/include/c++/v1/__locale:546:5: error: '__abi_tag__' attribute only applies to structs, variables, functions, and namespaces 546 | _LIBCPP_INLINE_VISIBILITY | ^ /usr/include/c++/v1/__config:813:37: note: expanded from macro '_LIBCPP_INLINE_VISIBILITY' 813 | # define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI | ^ /usr/include/c++/v1/__config:792:26: note: expanded from macro '_LIBCPP_HIDE_FROM_ABI' 792 | __attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_VERSIONED_IDENTIFIER)))) | ^ In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/cp/module.cc:208: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/system.h:239: In file included from /usr/include/c++/v1/vector:321: In file included from /usr/include/c++/v1/__format/formatter_bool.h:20: In file included from /usr/include/c++/v1/__format/formatter_integral.h:32: In file included from /usr/include/c++/v1/locale:202: /usr/include/c++/v1/__locale:547:37: error: expected ';' at end of declaration list 547 | char_type toupper(char_type __c) const | ^ /usr/include/c++/v1/__locale:553:48: error: too many arguments provided to function-like macro invocation 553 | const char_type* toupper(char_type* __low, const char_type* __high) const | ^ /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/../include/safe-ctype.h:146:9: note: macro 'toupper' defined here 146 | #define toupper(c) do_not_use_toupper_with_safe_ctype | ^ This is because gcc/system.h includes safe-ctype.h which redefines ctype macros such as toupper, tolower, etc to "poison" them. However, it should only include the safe-ctype.h header *after* any C++ headers, such as , , , etc, otherwise these might transitively include internal ctype headers (such as with libc++ 17), causing the above conflicts. Fix it by moving the safe-ctype.h inclusion to later in gcc/system.h, which solves this issue, and makes it possible to build against libc++ 17. See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111632 PR: 274039 Approved by: maintainer timeout (2 weeks) MFH: 2023Q4 --- .../files/patch-src_gcc_gcc_system.h | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h new file mode 100644 index 000000000000..354076612969 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h @@ -0,0 +1,42 @@ +--- src/gcc/gcc/system.h.orig 2021-06-01 00:15:23 UTC ++++ src/gcc/gcc/system.h +@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE *, const char *, ... + #endif + #endif + +-/* There are an extraordinary number of issues with . +- The last straw is that it varies with the locale. Use libiberty's +- replacement instead. */ +-#include "safe-ctype.h" +- +-#include +- +-#include +- +-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO +-extern int errno; +-#endif +- + #ifdef __cplusplus + #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) + # include +@@ -235,6 +222,19 @@ extern int errno; + # include + # include + # include ++#endif ++ ++/* There are an extraordinary number of issues with . ++ The last straw is that it varies with the locale. Use libiberty's ++ replacement instead. */ ++#include "safe-ctype.h" ++ ++#include ++ ++#include ++ ++#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO ++extern int errno; + #endif + + /* Some of glibc's string inlines cause warnings. Plus we'd rather