gcc12: Fix build on NetBSD10

[Jason W. Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon Jun 24 20:06:35 2024 -0500
Changeset:	8333b5acae8306b8d1eabee85d38ed402a1e7089

Modified Files:
	gcc12/distinfo
Added Files:
	gcc12/patches/patch-gcc_cp_cvt.cc
	gcc12/patches/patch-gcc_tree.cc

Log Message:
gcc12: Fix build on NetBSD10

Adjust include order to dodge problems caused by Darwin fix

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8333b5acae8306b8d1eabee85d38ed402a1e7089

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc12/distinfo                    |  2 ++
 gcc12/patches/patch-gcc_cp_cvt.cc | 22 ++++++++++++++++++++++
 gcc12/patches/patch-gcc_tree.cc   | 22 ++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diffs:
diff --git a/gcc12/distinfo b/gcc12/distinfo
index 528e5a4b24..4827e3517b 100644
--- a/gcc12/distinfo
+++ b/gcc12/distinfo
@@ -21,8 +21,10 @@ SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab3590
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 367d83c808fd7b5b1989d0490b532ad06b425b31
 SHA1 (patch-gcc_config_nvptx_gen-opt.sh) = 67b8c84f198561c1d964a50946937a0a9cc26749
 SHA1 (patch-gcc_configure) = f13d23c46315d18fdbc3bbbad26d0763e2b27690
+SHA1 (patch-gcc_cp_cvt.cc) = 1004031816a887e140af7154dd605ac817118fe8
 SHA1 (patch-gcc_system.h) = b16b5b8382831068832cf7d79603b905ec01691e
 SHA1 (patch-gcc_targhooks.cc) = 3bd54b7c3efc310aa2277f33cbd87b4a877cafea
+SHA1 (patch-gcc_tree.cc) = caa2d8e477e6c03b9f50705e84ac653257292bb7
 SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e
 SHA1 (patch-libcc1_libcc1plugin.cc) = e93eccfbbb6f43461071ec6b87b1575cae8d122c
 SHA1 (patch-libcc1_libcp1plugin.cc) = c323e9118bd9860d1824e16e1af578aec4145c46
diff --git a/gcc12/patches/patch-gcc_cp_cvt.cc b/gcc12/patches/patch-gcc_cp_cvt.cc
new file mode 100644
index 0000000000..5eec0fd1b5
--- /dev/null
+++ b/gcc12/patches/patch-gcc_cp_cvt.cc
@@ -0,0 +1,22 @@
+$NetBSD$
+
+# Unpoison macros on NetBSD
+
+--- gcc/cp/cvt.cc.orig	2024-06-24 19:46:45.127464308 +0000
++++ gcc/cp/cvt.cc
+@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  
+    but what kind of conversions it does will depend on the language.  */
+ 
+ #include "config.h"
++#include "escaped_string.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "target.h"
+@@ -35,7 +36,6 @@ along with GCC; see the file COPYING3.  
+ #include "convert.h"
+ #include "stringpool.h"
+ #include "attribs.h"
+-#include "escaped_string.h"
+ 
+ static tree convert_to_pointer_force (tree, tree, tsubst_flags_t);
+ static tree build_type_conversion (tree, tree);
diff --git a/gcc12/patches/patch-gcc_tree.cc b/gcc12/patches/patch-gcc_tree.cc
new file mode 100644
index 0000000000..a38f4b2fcc
--- /dev/null
+++ b/gcc12/patches/patch-gcc_tree.cc
@@ -0,0 +1,22 @@
+$NetBSD$
+
+# Unpoison macros on NetBSD
+
+--- gcc/tree.cc.orig	2024-06-24 19:45:22.968928884 +0000
++++ gcc/tree.cc
+@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3.  
+    calls language-dependent routines.  */
+ 
+ #include "config.h"
++#include "escaped_string.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "backend.h"
+@@ -67,7 +68,6 @@ along with GCC; see the file COPYING3.  
+ #include "regs.h"
+ #include "tree-vector-builder.h"
+ #include "gimple-fold.h"
+-#include "escaped_string.h"
+ #include "gimple-range.h"
+ #include "gomp-constants.h"
+ #include "dfp.h"