From 66ed76361b07f18610a134dca21c6945f03c6a6b Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 7 Mar 2024 20:41:22 +0000 Subject: 14.0.0: drop 50_all_PR111632_system_cxx_headers_libcxx.patch qookie reports it's broken: ``` x86_64-pc-linux-gnu-g++ -fPIC -c -DIN_GCC_FRONTEND -march=znver2 -pipe -ggdb3 -D_GLIBCXX_ASSERTIONS -O3 -fno-harden-control-flow-redundancy -DIN_GCC -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Wconditionally-supported -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -fno-common -DHAVE_CONFIG_H -fPIC -I. -Ijit -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/jit -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../include -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../libcpp/include -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../libcody -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../libdecnumber -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../libdecnumber/bid -I../libdecnumber -I/var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../libbacktrace -o jit/jit-recording.o -MT jit/jit-recording.o -MMD -MP -MF jit/.deps/jit-recording.TPo /var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/jit/jit-recording.cc In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/bits/basic_ios.h:37, from /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/ios:46, from /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/istream:40, from /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/sstream:40, from /var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/system.h:774, from /var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/jit/jit-recording.cc:25: /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/bits/locale_facets.h:250:53: error: macro "toupper" passed 2 arguments, but takes just 1 250 | toupper(char_type *__lo, const char_type* __hi) const | ^ In file included from /var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/system.h:235: /var/tmp/portage/sys-devel/gcc-14.0.9999/work/gcc-14.0.9999/gcc/../include/safe-ctype.h:146:9: note: macro "toupper" defined here 146 | #define toupper(c) do_not_use_toupper_with_safe_ctype | ^~~~~~~ [...] ``` Signed-off-by: Sam James --- ...50_all_PR111632_system_cxx_headers_libcxx.patch | 239 --------------------- 1 file changed, 239 deletions(-) delete mode 100644 14.0.0/gentoo/50_all_PR111632_system_cxx_headers_libcxx.patch diff --git a/14.0.0/gentoo/50_all_PR111632_system_cxx_headers_libcxx.patch b/14.0.0/gentoo/50_all_PR111632_system_cxx_headers_libcxx.patch deleted file mode 100644 index d44963e..0000000 --- a/14.0.0/gentoo/50_all_PR111632_system_cxx_headers_libcxx.patch +++ /dev/null @@ -1,239 +0,0 @@ -https://bugs.gentoo.org/912035 -https://inbox.sourceware.org/gcc-patches/0623E896-6B99-49EC-9144-B41BC51089F0@andric.com -https://inbox.sourceware.org/gcc-patches/15D35FFE-1E97-4047-A75C-F13D25826E15@andric.com -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274038 -https://gcc.gnu.org/PR111632 - -From 025e2a1abb2d14b421cb1e4b0aaae43c87bceb71 Mon Sep 17 00:00:00 2001 -From: Dimitry Andric -Date: Tue, 30 Jan 2024 20:03:38 +0000 -Subject: [PATCH] Include safe-ctype.h after C++ standard headers, to avoid - over-poisoning - -When building gcc's C++ sources against recent libc++, the poisoning of -the ctype macros due to including safe-ctype.h before including C++ -standard headers such as , , etc, causes many compilation -errors, similar to: - -In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23: -In file included from /home/dim/src/gcc/master/gcc/system.h:233: -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 /home/dim/src/gcc/master/gcc/gensupport.cc:23: -In file included from /home/dim/src/gcc/master/gcc/system.h:233: -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 - | ^ -/home/dim/src/gcc/master/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 libc++ uses different transitive includes than -libstdc++, and some of those transitive includes pull in various ctype -declarations (typically via ). - -There was already a special case for including before -safe-ctype.h, so move the rest of the C++ standard header includes to -the same location, to fix the problem. - -Signed-off-by: Dimitry Andric ---- - gcc/jit/dummy-frontend.cc | 2 ++ - gcc/jit/jit-builtins.cc | 2 ++ - gcc/jit/jit-playback.cc | 2 ++ - gcc/jit/jit-playback.h | 7 +++---- - gcc/jit/jit-recording.cc | 4 +++- - gcc/jit/jit-recording.h | 6 +++--- - gcc/jit/libgccjit.cc | 2 ++ - libcc1/libcc1plugin.cc | 3 +-- - libcc1/libcp1plugin.cc | 3 +-- - 9 files changed, 19 insertions(+), 12 deletions(-) - -diff --git a/gcc/jit/dummy-frontend.cc b/gcc/jit/dummy-frontend.cc -index dbeeacd17a86..2339e593d028 100644 ---- a/gcc/jit/dummy-frontend.cc -+++ b/gcc/jit/dummy-frontend.cc -@@ -18,6 +18,8 @@ along with GCC; see the file COPYING3. If not see - . */ - - #include "config.h" -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "system.h" - #include "coretypes.h" - #include "jit-playback.h" -diff --git a/gcc/jit/jit-builtins.cc b/gcc/jit/jit-builtins.cc -index e0bb24738ddf..c69e64fd6ee5 100644 ---- a/gcc/jit/jit-builtins.cc -+++ b/gcc/jit/jit-builtins.cc -@@ -18,6 +18,8 @@ along with GCC; see the file COPYING3. If not see - . */ - - #include "config.h" -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "system.h" - #include "coretypes.h" - #include "target.h" -diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc -index 6baa838af10a..90e3b0ff1907 100644 ---- a/gcc/jit/jit-playback.cc -+++ b/gcc/jit/jit-playback.cc -@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see - - #include "config.h" - #define INCLUDE_MUTEX -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "libgccjit.h" - #include "system.h" - #include "coretypes.h" -diff --git a/gcc/jit/jit-playback.h b/gcc/jit/jit-playback.h -index aa6a086613c5..751a55526e16 100644 ---- a/gcc/jit/jit-playback.h -+++ b/gcc/jit/jit-playback.h -@@ -21,10 +21,9 @@ along with GCC; see the file COPYING3. If not see - #ifndef JIT_PLAYBACK_H - #define JIT_PLAYBACK_H - --#include --#include // for std::pair --#include -- -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR -+#include "system.h" - #include "timevar.h" - #include "varasm.h" - -diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc -index 68a2e860c1fb..4fa0ae02ef91 100644 ---- a/gcc/jit/jit-recording.cc -+++ b/gcc/jit/jit-recording.cc -@@ -19,6 +19,9 @@ along with GCC; see the file COPYING3. If not see - . */ - - #include "config.h" -+#define INCLUDE_SSTREAM -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "system.h" - #include "coretypes.h" - #include "tm.h" -@@ -29,7 +32,6 @@ along with GCC; see the file COPYING3. If not see - #include "jit-builtins.h" - #include "jit-recording.h" - #include "jit-playback.h" --#include - - namespace gcc { - namespace jit { -diff --git a/gcc/jit/jit-recording.h b/gcc/jit/jit-recording.h -index d8d16f4fe29c..679f86662a6b 100644 ---- a/gcc/jit/jit-recording.h -+++ b/gcc/jit/jit-recording.h -@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see - #ifndef JIT_RECORDING_H - #define JIT_RECORDING_H - -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "jit-common.h" - #include "jit-logging.h" - #include "libgccjit.h" -- --#include --#include -+#include "system.h" - - class timer; - -diff --git a/gcc/jit/libgccjit.cc b/gcc/jit/libgccjit.cc -index f40a97814051..3bbe4dcd75cb 100644 ---- a/gcc/jit/libgccjit.cc -+++ b/gcc/jit/libgccjit.cc -@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see - - #include "config.h" - #define INCLUDE_MUTEX -+#define INCLUDE_STRING -+#define INCLUDE_VECTOR - #include "system.h" - #include "coretypes.h" - #include "timevar.h" -diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc -index 72d17c3b81c5..e64847466f4d 100644 ---- a/libcc1/libcc1plugin.cc -+++ b/libcc1/libcc1plugin.cc -@@ -32,6 +32,7 @@ - #undef PACKAGE_VERSION - - #define INCLUDE_MEMORY -+#define INCLUDE_VECTOR - #include "gcc-plugin.h" - #include "system.h" - #include "coretypes.h" -@@ -69,8 +70,6 @@ - #include "gcc-c-interface.h" - #include "context.hh" - --#include -- - using namespace cc1_plugin; - - -diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc -index 0eff7c68d298..da68c5d0ac1b 100644 ---- a/libcc1/libcp1plugin.cc -+++ b/libcc1/libcp1plugin.cc -@@ -33,6 +33,7 @@ - #undef PACKAGE_VERSION - - #define INCLUDE_MEMORY -+#define INCLUDE_VECTOR - #include "gcc-plugin.h" - #include "system.h" - #include "coretypes.h" -@@ -71,8 +72,6 @@ - #include "rpc.hh" - #include "context.hh" - --#include -- - using namespace cc1_plugin; - - --- -2.44.0 - -- cgit v1.2.3-65-gdbad