Bug 274038 - devel/avr-gcc: fix build with libc++ 17
Summary: devel/avr-gcc: fix build with libc++ 17
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Joerg Wunsch
URL:
Keywords:
Depends on:
Blocks: 273753
  Show dependency treegraph
 
Reported: 2023-09-23 07:53 UTC by Dimitry Andric
Modified: 2023-09-23 20:47 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (joerg)


Attachments
devel/avr-gcc: fix build with libc++ 17 (1.36 KB, patch)
2023-09-23 07:56 UTC, Dimitry Andric
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dimitry Andric freebsd_committer freebsd_triage 2023-09-23 07:53:30 UTC
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 <list>, <map>, <string>, etc, otherwise these might transitively include internal ctype headers (such as with libc++ 17), causing the above conflicts.

Here is a patch that moves the safe-ctype.h inclusion to later in gcc/system.h, which solves this issue, and makes it possible to build against libc++ 17.
Comment 1 Dimitry Andric freebsd_committer freebsd_triage 2023-09-23 07:56:16 UTC
Created attachment 245142 [details]
devel/avr-gcc: fix build with libc++ 17
Comment 2 Joerg Wunsch freebsd_committer freebsd_triage 2023-09-23 20:46:48 UTC
Thanks for the analysis and patch, applied.
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-09-23 20:47:14 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6275155b90de11398a1d105b053732313e7c1e7a

commit 6275155b90de11398a1d105b053732313e7c1e7a
Author:     Joerg Wunsch <joerg@FreeBSD.org>
AuthorDate: 2023-09-23 20:43:27 +0000
Commit:     Joerg Wunsch <joerg@FreeBSD.org>
CommitDate: 2023-09-23 20:46:17 +0000

    devel/avr-gcc: Fix build with libc++ 17

    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 <list>, <map>, <string>, etc, otherwise these
    might transitively include internal ctype headers (such as with libc++
    17), causing compilation errors.

    PR:             274038
    Reported by:    dim

 devel/avr-gcc/Makefile                       |  2 +-
 devel/avr-gcc/files/patch-gcc_system.h (new) | 42 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)