devkitPPC: remove old patch file

build-devkit.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 57
+#	devkitARM release 58
-#	devkitPPC release 40
+#	devkitPPC release 41
-#	devkitA64 release 18
+#	devkitA64 release 19
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then

dka64/patches/gcc-12.1.0.patch

@@ -1,71 +1,7 @@
-diff --git a/gcc/config.gcc b/gcc/config.gcc
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc
-index 357b0bed067..6b1e254785a 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config.gcc
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc	2022-05-02 21:50:30.090088643 +0100
-+++ b/gcc/config.gcc
+@@ -19417,8 +19417,24 @@
-@@ -1090,7 +1090,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
- 	tmake_file="${tmake_file} aarch64/t-aarch64"
- 	case $target in
- 	aarch64-*-elf*)
-+		default_use_cxa_atexit=yes
- 		use_gcc_stdint=wrap
-+		tm_file="${tm_file} devkitpro.h"
-+		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
-+		extra_options="${extra_options} devkitpro.opt"
-+		case ${enable_threads} in
-+			"" | yes | posix) thread_file='posix' ;;
-+		esac
- 		;;
-         aarch64-*-fuchsia*)
-                 tm_file="${tm_file} fuchsia.h"
-diff --git a/gcc/config.host b/gcc/config.host
-index 0a02c33cc80..38f7adc655e 100644
---- a/gcc/config.host
-+++ b/gcc/config.host
-@@ -251,6 +251,10 @@ case ${host} in
-     host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
-     host_lto_plugin_soname=liblto_plugin.dll
-     ;;
-+  aarch64-*-darwin*)
-+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
-+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
-+    ;;
-   i[34567]86-*-darwin* | x86_64-*-darwin*)
-     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
-     host_xmake_file="${host_xmake_file} i386/x-darwin"
-diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index e986149e400..9264d53f32c 100644
---- a/gcc/config/aarch64/aarch64-elf-raw.h
-+++ b/gcc/config/aarch64/aarch64-elf-raw.h
-@@ -22,6 +22,7 @@
- #ifndef GCC_AARCH64_ELF_RAW_H
- #define GCC_AARCH64_ELF_RAW_H
- 
-+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
- #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
- #define ENDFILE_SPEC \
-   " crtend%O%s crtn%O%s " \
-diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
-index af3b7364a74..6df7a0dc8a1 100644
---- a/gcc/config/aarch64/aarch64-opts.h
-+++ b/gcc/config/aarch64/aarch64-opts.h
-@@ -48,6 +48,12 @@ enum aarch64_tls_type {
-   TLS_DESCRIPTORS
- };
- 
-+/* Which thread pointer access sequence to use.  */
-+enum aarch64_tp_type {
-+  TP_HARD,
-+  TP_SOFT
-+};
-+
- /* The code model defines the address generation strategy.
-    Most have a PIC and non-PIC variant.  */
- enum aarch64_code_model {
-diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
-index c2f4b27f6e4..ec05f056568 100644
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -18053,8 +18053,24 @@ aarch64_load_tp (rtx target)
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -92,11 +28,21 @@ index c2f4b27f6e4..ec05f056568 100644
    return target;
  }
  
-diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h
-index bfffbcd6abf..814de8c2918 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/aarch64/aarch64.h
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h	2022-05-02 21:50:30.086094234 +0100
-+++ b/gcc/config/aarch64/aarch64.h
+@@ -22,6 +22,7 @@
-@@ -1191,6 +1191,10 @@ typedef struct
+ #ifndef GCC_AARCH64_ELF_RAW_H
+ #define GCC_AARCH64_ELF_RAW_H
+ 
++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
+ #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
+ #define ENDFILE_SPEC \
+   " crtend%O%s crtn%O%s " \
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h	2022-05-02 21:50:30.090088643 +0100
+@@ -1245,6 +1245,10 @@
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -107,7 +53,7 @@ index bfffbcd6abf..814de8c2918 100644
  extern enum aarch64_code_model aarch64_cmodel;
  
  /* When using the tiny addressing model conditional and unconditional branches
-@@ -1236,7 +1240,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
+@@ -1290,7 +1294,7 @@
  #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
    { "rewrite_mcpu", aarch64_rewrite_mcpu },
  
@@ -116,11 +62,10 @@ index bfffbcd6abf..814de8c2918 100644
  extern const char *host_detect_local_cpu (int argc, const char **argv);
  #define HAVE_LOCAL_CPU_DETECT
  # define EXTRA_SPEC_FUNCTIONS						\
-diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md
-index aef6da9732d..1cbffec5ef8 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/aarch64/aarch64.md
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md	2022-05-02 21:50:30.090088643 +0100
-+++ b/gcc/config/aarch64/aarch64.md
+@@ -6899,11 +6899,22 @@
-@@ -6772,11 +6772,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -145,11 +90,10 @@ index aef6da9732d..1cbffec5ef8 100644
  ;; The TLS ABI specifically requires that the compiler does not schedule
  ;; instructions in the TLS stubs, in order to enable linker relaxation.
  ;; Therefore we treat the stubs as an atomic sequence.
-diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
-index 32191cf1acf..49b03937bdd 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/aarch64/aarch64.opt
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt	2022-05-02 21:50:30.090088643 +0100
-+++ b/gcc/config/aarch64/aarch64.opt
+@@ -122,6 +122,21 @@
-@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
  EnumValue
  Enum(aarch64_tls_size) String(48) Value(48)
  
@@ -171,7 +115,7 @@ index 32191cf1acf..49b03937bdd 100644
  march=
  Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
  Use features of architecture ARCH.
-@@ -260,7 +275,7 @@ TargetVariable
+@@ -260,7 +275,7 @@
  long aarch64_stack_protector_guard_offset = 0
  
  moutline-atomics
@@ -180,49 +124,26 @@ index 32191cf1acf..49b03937bdd 100644
  Generate local calls to out-of-line atomic operations.
  
  -param=aarch64-sve-compare-costs=
-diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h
-new file mode 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h	2022-04-29 14:58:22.000000000 +0100
-index 00000000000..92c38b0b9db
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h	2022-05-02 21:50:30.086094234 +0100
---- /dev/null
+@@ -48,6 +48,12 @@
-+++ b/gcc/config/aarch64/host-aarch64-darwin.c
+   TLS_DESCRIPTORS
-@@ -0,0 +1,32 @@
+ };
-+/* i386-darwin host-specific hook definitions.
+ 
-+   Copyright (C) 2003-2021 Free Software Foundation, Inc.
++/* Which thread pointer access sequence to use.  */
++enum aarch64_tp_type {
++  TP_HARD,
++  TP_SOFT
++};
 +
-+This file is part of GCC.
+ /* The code model defines the address generation strategy.
-+
+    Most have a PIC and non-PIC variant.  */
-+GCC is free software; you can redistribute it and/or modify it under
+ enum aarch64_code_model {
-+the terms of the GNU General Public License as published by the Free
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
-+Software Foundation; either version 3, or (at your option) any later
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64	2022-04-29 14:58:22.000000000 +0100
-+version.
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64	2022-05-02 21:50:30.090088643 +0100
-+
+@@ -177,8 +177,10 @@
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define IN_TARGET_CODE 1
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
-+#include "config/host-darwin.h"
-+
-+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
-+   to include config/host-darwin.h.  */
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 7e1606c47ac..3b650075724 100644
---- a/gcc/config/aarch64/t-aarch64
-+++ b/gcc/config/aarch64/t-aarch64
-@@ -165,8 +165,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
  		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
  
  comma=,
@@ -235,21 +156,10 @@ index 7e1606c47ac..3b650075724 100644
  
  insn-conditions.md: s-check-sve-md
  s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
-diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
-new file mode 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h	1970-01-01 01:00:00.000000000 +0100
-index 00000000000..6d788d5e89c
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h	2022-05-02 22:04:49.962851033 +0100
---- /dev/null
+@@ -0,0 +1,29 @@
-+++ b/gcc/config/aarch64/x-darwin
-@@ -0,0 +1,3 @@
-+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
-+	$(COMPILE) $<
-+	$(POSTCOMPILE)
-diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
-new file mode 100644
-index 00000000000..11ba0f5ab1c
---- /dev/null
-+++ b/gcc/config/devkitpro.h
-@@ -0,0 +1,31 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -279,13 +189,9 @@ index 00000000000..11ba0f5ab1c
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
 +    } while (0)
-+
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt
-+
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt	1970-01-01 01:00:00.000000000 +0100
-diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt	2022-05-02 21:50:30.090088643 +0100
-new file mode 100644
-index 00000000000..9acbbf9d27c
---- /dev/null
-+++ b/gcc/config/devkitpro.opt
 @@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
@@ -316,11 +222,10 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc
-index 360a280b23a..2c03947999a 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/i386/host-mingw32.c
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc	2022-05-02 21:50:30.090088643 +0100
-+++ b/gcc/config/i386/host-mingw32.c
+@@ -45,7 +45,11 @@
-@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
  static inline void w32_error(const char*, const char*, int, const char*);
  
  /* FIXME: Is this big enough?  */
@@ -332,11 +237,28 @@ index 360a280b23a..2c03947999a 100644
  
  /* Granularity for reserving address space.  */
  static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
-index 4d790f9dd4a..10f0d08524c 100644
+--- gcc-12.1.0-RC-20220429/gcc/config.gcc	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/gcc.c
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc	2022-05-02 21:50:30.086094234 +0100
-+++ b/gcc/gcc.c
+@@ -1093,7 +1093,14 @@
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
+ 	tmake_file="${tmake_file} aarch64/t-aarch64"
+ 	case $target in
+ 	aarch64-*-elf*)
++		default_use_cxa_atexit=yes
+ 		use_gcc_stdint=wrap
++		tm_file="${tm_file} devkitpro.h"
++		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
++		extra_options="${extra_options} devkitpro.opt"
++		case ${enable_threads} in
++			"" | yes | posix) thread_file='posix' ;;
++		esac
+ 		;;
+         aarch64-*-fuchsia*)
+                 tm_file="${tm_file} fuchsia.h"
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -860,6 +860,11 @@
  #endif
  #endif
  
@@ -348,7 +270,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1204,6 +1209,7 @@
  static const char *lib_spec = LIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -356,7 +278,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] =
+@@ -1709,6 +1715,7 @@
    INIT_STATIC_SPEC ("lib",			&lib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -364,11 +286,10 @@ index 4d790f9dd4a..10f0d08524c 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
-index 675930db043..bdfd6f6b0bb 100644
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
---- a/libgcc/crtstuff.c
++++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c	2022-05-02 21:50:30.094083051 +0100
-+++ b/libgcc/crtstuff.c
+@@ -325,7 +325,7 @@
-@@ -325,7 +325,7 @@ register_tm_clones (void)
  
  #ifdef OBJECT_FORMAT_ELF
  
@@ -377,11 +298,10 @@ index 675930db043..bdfd6f6b0bb 100644
  /* Declare the __dso_handle variable.  It should have a unique value
     in every shared-object; in a main program its value is zero.  The
     object should in any case be protected.  This means the instance
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
-index cca3f294b7b..deffea4107b 100644
+--- gcc-12.1.0-RC-20220429/libgcc/gthr.h	2022-04-29 14:58:25.000000000 +0100
---- a/libgcc/gthr.h
++++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h	2022-05-02 21:50:30.094083051 +0100
-+++ b/libgcc/gthr.h
+@@ -136,7 +136,7 @@
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  /* The pe-coff weak support isn't fully compatible to ELF's weak.
     For static libraries it might would work, but as we need to deal
     with shared versions too, we disable it for mingw-targets.  */
@@ -390,11 +310,10 @@ index cca3f294b7b..deffea4107b 100644
  #undef GTHREAD_USE_WEAK
  #define GTHREAD_USE_WEAK 0
  #endif
-diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am
-index 40a41ef2a1c..4d06c6f9953 100644
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am	2022-04-29 14:58:26.000000000 +0100
---- a/libstdc++-v3/include/Makefile.am
++++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am	2022-05-02 21:50:30.094083051 +0100
-+++ b/libstdc++-v3/include/Makefile.am
+@@ -1366,6 +1366,7 @@
-@@ -1347,6 +1347,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
  	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -402,11 +321,10 @@ index 40a41ef2a1c..4d06c6f9953 100644
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
-diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in
-index fcd2b5b2d40..c034367994a 100644
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in	2022-04-29 14:58:26.000000000 +0100
---- a/libstdc++-v3/include/Makefile.in
++++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in	2022-05-02 21:50:30.094083051 +0100
-+++ b/libstdc++-v3/include/Makefile.in
+@@ -1857,6 +1857,7 @@
-@@ -1830,6 +1830,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
  	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -414,43 +332,3 @@ index fcd2b5b2d40..c034367994a 100644
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
-diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
- 
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
- 

dka64/scripts/build-gcc.sh

@@ -10,7 +10,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
         --prefix=$prefix --target=$target --disable-nls --disable-werror \
 	--enable-lto --enable-plugins --enable-poison-system-directories \
 	$CROSS_PARAMS \
@@ -39,9 +39,6 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -52,7 +49,7 @@ then
 		--enable-cxx-flags='-ffunction-sections' \
 		--disable-libstdcxx-verbose \
 		--enable-poison-system-directories \
-		--enable-interwork --enable-multilib \
+		--enable-multilib \
 		--enable-threads --disable-win32-registry --disable-nls --disable-debug\
 		--disable-libmudflap --disable-libssp --disable-libgomp \
 		--disable-libstdcxx-pch \
@@ -65,7 +62,7 @@ then
 		--enable-lto \
 		--disable-tm-clone-registry \
 		--disable-__cxa_atexit \
-		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 18" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 19" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		$EXTRA_GCC_PARAMS \

dkarm-eabi/patches/gcc-12.1.0.patch

@@ -1,70 +1,7 @@
-diff --git a/gcc/config.host b/gcc/config.host
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in
-index 0a02c33cc80..38f7adc655e 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config.host
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in	2022-04-30 13:31:09.120134164 +0100
-+++ b/gcc/config.host
+@@ -412,7 +412,7 @@
-@@ -251,6 +251,10 @@ case ${host} in
-     host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
-     host_lto_plugin_soname=liblto_plugin.dll
-     ;;
-+  aarch64-*-darwin*)
-+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
-+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
-+    ;;
-   i[34567]86-*-darwin* | x86_64-*-darwin*)
-     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
-     host_xmake_file="${host_xmake_file} i386/x-darwin"
-diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
-new file mode 100644
-index 00000000000..92c38b0b9db
---- /dev/null
-+++ b/gcc/config/aarch64/host-aarch64-darwin.c
-@@ -0,0 +1,32 @@
-+/* i386-darwin host-specific hook definitions.
-+   Copyright (C) 2003-2021 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define IN_TARGET_CODE 1
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
-+#include "config/host-darwin.h"
-+
-+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
-+   to include config/host-darwin.h.  */
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
-new file mode 100644
-index 00000000000..6d788d5e89c
---- /dev/null
-+++ b/gcc/config/aarch64/x-darwin
-@@ -0,0 +1,3 @@
-+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
-+	$(COMPILE) $<
-+	$(POSTCOMPILE)
-diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index ab4b6acf5ea..2b8d0da296f 100644
---- a/gcc/config/arm/arm-cpus.in
-+++ b/gcc/config/arm/arm-cpus.in
-@@ -402,7 +402,7 @@ begin arch armv6k
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -73,11 +10,16 @@ index ab4b6acf5ea..2b8d0da296f 100644
   option fp add VFPv2 FP_DBL
   optalias vfpv2 fp
   option nofp remove ALL_FP
-diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf
-index d68def30867..d31f1e31ee6 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/arm/t-arm-elf
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf	2022-04-30 13:31:39.759455398 +0100
-+++ b/gcc/config/arm/t-arm-elf
+@@ -1,4 +1,4 @@
-@@ -16,111 +16,14 @@
+-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
++# Copyright (C) 1998-2021 Free Software Foundation, Inc.
+ #
+ # This file is part of GCC.
+ #
+@@ -16,120 +16,14 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
  
@@ -103,6 +45,8 @@ index d68def30867..d31f1e31ee6 100644
 -# it seems to work ok.
 -v8_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
 -
+-v9_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
+-
 -# We don't do anything special with these.  Pre-v4t probably doesn't work.
 -all_early_nofp	:= armv4 armv4t armv5t
 -
@@ -114,6 +58,8 @@ index d68def30867..d31f1e31ee6 100644
 -all_v8_archs	:= armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
 -		   armv8.5-a armv8.6-a
 -
+-all_v9_archs	:= armv9-a
+-
 -# No floating point variants, require thumb1 softfp
 -all_nofp_t	:= armv6-m armv6s-m armv8-m.base
 -
@@ -171,11 +117,16 @@ index d68def30867..d31f1e31ee6 100644
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
- 
+-
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
+ 
+-MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
+-			  march?armv7+fp=march?$(ARCH) \
+-			  $(foreach FPARCH, $(v9_fps), \
+-			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
 +MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
  
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
@@ -194,10 +145,9 @@ index d68def30867..d31f1e31ee6 100644
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
-diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h
-index cca6f0ece54..8b78c28c7bb 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/arm/unknown-elf.h
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h	2022-04-30 13:31:09.120134164 +0100
-+++ b/gcc/config/arm/unknown-elf.h
 @@ -29,7 +29,7 @@
  #endif
  
@@ -214,11 +164,10 @@ index cca6f0ece54..8b78c28c7bb 100644
 -#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
 +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
 +
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc
-index 360a280b23a..2c03947999a 100644
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
---- a/gcc/config/i386/host-mingw32.c
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc	2022-04-30 13:31:09.120134164 +0100
-+++ b/gcc/config/i386/host-mingw32.c
+@@ -45,7 +45,11 @@
-@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
  static inline void w32_error(const char*, const char*, int, const char*);
  
  /* FIXME: Is this big enough?  */
@@ -230,11 +179,10 @@ index 360a280b23a..2c03947999a 100644
  
  /* Granularity for reserving address space.  */
  static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
-index 4d790f9dd4a..10f0d08524c 100644
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
---- a/gcc/gcc.c
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc	2022-04-30 13:31:09.120134164 +0100
-+++ b/gcc/gcc.c
+@@ -860,6 +860,11 @@
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -246,7 +194,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1204,6 +1209,7 @@
  static const char *lib_spec = LIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -254,7 +202,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] =
+@@ -1709,6 +1715,7 @@
    INIT_STATIC_SPEC ("lib",			&lib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -262,21 +210,19 @@ index 4d790f9dd4a..10f0d08524c 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi
-index dddddc7c444..c2502597953 100644
+--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi	2022-04-29 14:58:25.000000000 +0100
---- a/libgcc/config/arm/t-bpabi
++++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi	2022-04-30 13:31:09.120134164 +0100
-+++ b/libgcc/config/arm/t-bpabi
+@@ -17,4 +17,4 @@
-@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
  # On ARM, specifying -fnon-call-exceptions will needlessly pull in
  # the unwinder in simple programs which use 64-bit division.  Omitting
  # the option is safe.
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
-index 675930db043..bdfd6f6b0bb 100644
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
---- a/libgcc/crtstuff.c
++++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c	2022-04-30 13:31:09.120134164 +0100
-+++ b/libgcc/crtstuff.c
+@@ -325,7 +325,7 @@
-@@ -325,7 +325,7 @@ register_tm_clones (void)
  
  #ifdef OBJECT_FORMAT_ELF
  
@@ -285,43 +231,3 @@ index 675930db043..bdfd6f6b0bb 100644
  /* Declare the __dso_handle variable.  It should have a unique value
     in every shared-object; in a main program its value is zero.  The
     object should in any case be protected.  This means the instance
-diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
- 
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
- 

dkarm-eabi/scripts/build-gcc.sh

@@ -66,7 +66,7 @@ then
 		--with-system-zlib \
 		--disable-tm-clone-registry \
 		--disable-__cxa_atexit \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 57" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 58" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
                 $EXTRA_GCC_PARAMS \

dkppc/patches/binutils-2.36.1.patch

@@ -1,12 +0,0 @@
-diff -NBaur binutils-2.36.1/opcodes/ppc-opc.c binutils-2.36.1-ppc/opcodes/ppc-opc.c
---- binutils-2.36.1/opcodes/ppc-opc.c	2021-01-09 10:47:34.000000000 +0000
-+++ binutils-2.36.1-ppc/opcodes/ppc-opc.c	2021-02-14 19:41:09.350749949 +0000
-@@ -4225,7 +4225,7 @@
- #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
- 		 | PPC_OPCODE_TITAN)
- #define BOOKE	PPC_OPCODE_BOOKE
--#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
-+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
- #define PPCE300 PPC_OPCODE_E300
- #define PPCSPE	PPC_OPCODE_SPE
- #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/gcc-12.1.0.patch

@@ -1,8 +1,7 @@
-diff --git a/config/gthr.m4 b/config/gthr.m4
+diff -NBaur gcc-12.1.0/config/gthr.m4 gcc-12.1.0-dkppc/config/gthr.m4
-index 4b937306ad0..bfd0375bd60 100644
+--- gcc-12.1.0/config/gthr.m4	2022-05-06 08:30:56.000000000 +0100
---- a/config/gthr.m4
++++ gcc-12.1.0-dkppc/config/gthr.m4	2022-05-06 19:17:44.784777075 +0100
-+++ b/config/gthr.m4
+@@ -13,6 +13,7 @@
-@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
  case $1 in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
@@ -10,11 +9,10 @@ index 4b937306ad0..bfd0375bd60 100644
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+diff -NBaur gcc-12.1.0/gcc/config/i386/host-mingw32.cc gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc
-index 360a280b23a..2c03947999a 100644
+--- gcc-12.1.0/gcc/config/i386/host-mingw32.cc	2022-05-06 08:30:56.000000000 +0100
---- a/gcc/config/i386/host-mingw32.c
++++ gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc	2022-05-06 19:17:44.784777075 +0100
-+++ b/gcc/config/i386/host-mingw32.c
+@@ -45,7 +45,11 @@
-@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
  static inline void w32_error(const char*, const char*, int, const char*);
  
  /* FIXME: Is this big enough?  */
@@ -26,11 +24,10 @@ index 360a280b23a..2c03947999a 100644
  
  /* Granularity for reserving address space.  */
  static size_t va_granularity = 0x10000;
-diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
+diff -NBaur gcc-12.1.0/gcc/config/newlib-stdint.h gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h
-index 65d1fa2cd1f..51991aab75c 100644
+--- gcc-12.1.0/gcc/config/newlib-stdint.h	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/config/newlib-stdint.h
++++ gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h	2022-05-06 19:17:44.784777075 +0100
-+++ b/gcc/config/newlib-stdint.h
+@@ -25,7 +25,7 @@
-@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  /* newlib uses 32-bit long in certain cases for all non-SPU
     targets.  */
  #ifndef STDINT_LONG32
@@ -39,19 +36,18 @@ index 65d1fa2cd1f..51991aab75c 100644
  #endif
  
  #define SIG_ATOMIC_TYPE "int"
-diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/rs6000.h gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h
-index a7953fad965..04abd41239b 100644
+--- gcc-12.1.0/gcc/config/rs6000/rs6000.h	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/config/rs6000/rs6000.h
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h	2022-05-06 19:22:10.793624730 +0100
-+++ b/gcc/config/rs6000/rs6000.h
+@@ -196,6 +196,7 @@
-@@ -196,6 +196,7 @@ ASM_OPT_ANY
  /* -mcpu=native handling only makes sense with compiler running on
     an PowerPC chip.  If changing this condition, also change
-    the condition in driver-rs6000.c.  */
+    the condition in driver-rs6000.cc.  */
 +#if 0
  #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
- /* In driver-rs6000.c.  */
+ /* In driver-rs6000.cc.  */
  extern const char *host_detect_local_cpu (int argc, const char **argv);
-@@ -207,6 +208,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -207,6 +208,8 @@
  #else
  #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
  #endif
@@ -60,11 +56,10 @@ index a7953fad965..04abd41239b 100644
  
  #ifndef CC1_CPU_SPEC
  #ifdef HAVE_LOCAL_CPU_DETECT
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h
-index 510abe169c5..988e82007b0 100644
+--- gcc-12.1.0/gcc/config/rs6000/sysv4.h	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/config/rs6000/sysv4.h
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h	2022-05-06 19:17:44.784777075 +0100
-+++ b/gcc/config/rs6000/sysv4.h
+@@ -589,7 +589,11 @@
-@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
  
  /* Default starting address if specified.  */
  #define LINK_START_SPEC "\
@@ -77,7 +72,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(link_start_yellowknife) ; \
    mmvme        : %(link_start_mvme)        ; \
    msim         : %(link_start_sim)         ; \
-@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -620,7 +624,8 @@
  
  /* Any specific OS flags.  */
  #define LINK_OS_SPEC "\
@@ -87,7 +82,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(link_os_yellowknife) ; \
    mmvme        : %(link_os_mvme)        ; \
    msim         : %(link_os_sim)         ; \
-@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -635,7 +640,10 @@
  /* Override rs6000.h definition.  */
  #undef	CPP_SPEC
  #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -99,7 +94,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(cpp_os_yellowknife) ; \
    mmvme        : %(cpp_os_mvme)        ; \
    msim         : %(cpp_os_sim)         ; \
-@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -649,7 +657,10 @@
  
  #undef	STARTFILE_SPEC
  #define	STARTFILE_SPEC "\
@@ -111,7 +106,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(startfile_yellowknife) ; \
    mmvme        : %(startfile_mvme)        ; \
    msim         : %(startfile_sim)         ; \
-@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -663,7 +674,8 @@
  
  #undef	LIB_SPEC
  #define	LIB_SPEC "\
@@ -121,7 +116,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(lib_yellowknife) ; \
    mmvme        : %(lib_mvme)        ; \
    msim         : %(lib_sim)         ; \
-@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -673,11 +685,12 @@
    mcall-openbsd: %(lib_openbsd)     ; \
                 : %(lib_default)     }"
  
@@ -136,7 +131,7 @@ index 510abe169c5..988e82007b0 100644
    myellowknife : %(endfile_yellowknife) ; \
    mmvme        : %(endfile_mvme)        ; \
    msim         : %(endfile_sim)         ; \
-@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -693,16 +706,27 @@
  
  /* Motorola ADS support.  */
  #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -164,7 +159,7 @@ index 510abe169c5..988e82007b0 100644
  
  /* Motorola Yellowknife support.  */
  #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -851,6 +875,7 @@ ncrtn.o%s"
+@@ -850,6 +874,7 @@
  #undef	SUBTARGET_EXTRA_SPECS
  #define	SUBTARGET_EXTRA_SPECS						\
    { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -172,7 +167,7 @@ index 510abe169c5..988e82007b0 100644
    { "lib_ads",			LIB_ADS_SPEC },				\
    { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
    { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -860,6 +885,7 @@ ncrtn.o%s"
+@@ -859,6 +884,7 @@
    { "lib_netbsd",		LIB_NETBSD_SPEC },			\
    { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
    { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -180,7 +175,7 @@ index 510abe169c5..988e82007b0 100644
    { "startfile_ads",		STARTFILE_ADS_SPEC },			\
    { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
    { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -869,6 +895,7 @@ ncrtn.o%s"
+@@ -868,6 +894,7 @@
    { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
    { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
    { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -188,7 +183,7 @@ index 510abe169c5..988e82007b0 100644
    { "endfile_ads",		ENDFILE_ADS_SPEC },			\
    { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
    { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -880,7 +907,11 @@ ncrtn.o%s"
+@@ -879,7 +906,11 @@
    { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
    { "link_shlib",		LINK_SHLIB_SPEC },			\
    { "link_start",		LINK_START_SPEC },			\
@@ -200,7 +195,7 @@ index 510abe169c5..988e82007b0 100644
    { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
    { "link_start_mvme",		LINK_START_MVME_SPEC },			\
    { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -890,6 +921,7 @@ ncrtn.o%s"
+@@ -889,6 +920,7 @@
    { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
    { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
    { "link_os",			LINK_OS_SPEC },				\
@@ -208,7 +203,7 @@ index 510abe169c5..988e82007b0 100644
    { "link_os_ads",		LINK_OS_ADS_SPEC },			\
    { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
    { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -901,6 +933,9 @@ ncrtn.o%s"
+@@ -900,6 +932,9 @@
    { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
    { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
    { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
@@ -218,11 +213,10 @@ index 510abe169c5..988e82007b0 100644
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.opt gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt
-index 7ab55c49940..763709e907e 100644
+--- gcc-12.1.0/gcc/config/rs6000/sysv4.opt	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/config/rs6000/sysv4.opt
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt	2022-05-06 19:17:44.784777075 +0100
-+++ b/gcc/config/rs6000/sysv4.opt
+@@ -124,6 +124,26 @@
-@@ -124,6 +124,26 @@ mads
  Target RejectNegative
  Link with libads.a, libc.a and crt0.o.
  
@@ -249,11 +243,10 @@ index 7ab55c49940..763709e907e 100644
  myellowknife
  Target RejectNegative
  Link with libyk.a, libc.a and crt0.o.
-diff --git a/gcc/configure b/gcc/configure
+diff -NBaur gcc-12.1.0/gcc/configure gcc-12.1.0-dkppc/gcc/configure
-index 9b28369e3bf..79b95018a89 100755
+--- gcc-12.1.0/gcc/configure	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/configure
++++ gcc-12.1.0-dkppc/gcc/configure	2022-05-06 19:17:44.788859483 +0100
-+++ b/gcc/configure
+@@ -12884,7 +12884,7 @@
-@@ -12593,7 +12593,7 @@ case ${enable_threads} in
      # default
      target_thread_file='single'
      ;;
@@ -262,11 +255,10 @@ index 9b28369e3bf..79b95018a89 100755
    single | tpf | vxworks | win32)
      target_thread_file=${enable_threads}
      ;;
-diff --git a/gcc/configure.ac b/gcc/configure.ac
+diff -NBaur gcc-12.1.0/gcc/configure.ac gcc-12.1.0-dkppc/gcc/configure.ac
-index 162e08cbc02..34d35d0de8d 100644
+--- gcc-12.1.0/gcc/configure.ac	2022-05-06 08:30:57.000000000 +0100
---- a/gcc/configure.ac
++++ gcc-12.1.0-dkppc/gcc/configure.ac	2022-05-06 19:17:44.788859483 +0100
-+++ b/gcc/configure.ac
+@@ -1994,7 +1994,7 @@
-@@ -1925,7 +1925,7 @@ case ${enable_threads} in
      # default
      target_thread_file='single'
      ;;
@@ -275,10 +267,9 @@ index 162e08cbc02..34d35d0de8d 100644
    single | tpf | vxworks | win32)
      target_thread_file=${enable_threads}
      ;;
-diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S
-index b372409dd42..708ba039963 100644
+--- gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S	2022-05-06 08:30:59.000000000 +0100
---- a/libgcc/config/rs6000/crtrestvr.S
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S	2022-05-06 19:17:44.792941894 +0100
-+++ b/libgcc/config/rs6000/crtrestvr.S
 @@ -24,7 +24,7 @@
  
  /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -288,15 +279,14 @@ index b372409dd42..708ba039963 100644
  #undef __ALTIVEC__
  #define __ALTIVEC__ 1
  	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
+@@ -86,3 +86,4 @@
  CFI_ENDPROC
  
  #endif
 +#endif
-diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S
-index 48a4d65eed4..6835ea69279 100644
+--- gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S	2022-05-06 08:30:59.000000000 +0100
---- a/libgcc/config/rs6000/crtsavevr.S
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S	2022-05-06 19:17:44.792941894 +0100
-+++ b/libgcc/config/rs6000/crtsavevr.S
 @@ -24,7 +24,7 @@
  
  /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -306,16 +296,14 @@ index 48a4d65eed4..6835ea69279 100644
  #undef __ALTIVEC__
  #define __ALTIVEC__ 1
  	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
+@@ -86,3 +86,4 @@
  CFI_ENDPROC
  
  #endif
 +#endif
-diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c
-new file mode 100644
+--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c	1970-01-01 01:00:00.000000000 +0100
-index 00000000000..26180aa7f36
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c	2022-05-06 19:17:44.792941894 +0100
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.c
 @@ -0,0 +1,319 @@
 +/* Threads compatibility routines for libgcc2 and libobjc.  */
 +/* Compile this one with gcc.  */
@@ -636,11 +624,9 @@ index 00000000000..26180aa7f36
 +
 +  return __gthr_impl_cond_destroy(__cond);
 +}
-diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h
-new file mode 100644
+--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h	1970-01-01 01:00:00.000000000 +0100
-index 00000000000..72ecf82ab83
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h	2022-05-06 19:17:44.792941894 +0100
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.h
 @@ -0,0 +1,187 @@
 +/* Threads compatibility routines for libgcc2 and libobjc.  */
 +/* Compile this one with gcc.  */
@@ -829,21 +815,19 @@ index 00000000000..72ecf82ab83
 +#endif
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
-diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/t-ppccomm gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm
-index fb812d3801f..7f6669d530f 100644
+--- gcc-12.1.0/libgcc/config/rs6000/t-ppccomm	2022-05-06 08:30:59.000000000 +0100
---- a/libgcc/config/rs6000/t-ppccomm
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm	2022-05-06 19:17:44.792941894 +0100
-+++ b/libgcc/config/rs6000/t-ppccomm
 @@ -1,4 +1,5 @@
  LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
 +	   $(srcdir)/config/rs6000/gthr-dkp.c \
  	   $(srcdir)/config/rs6000/tramp.S
  
  # This can't end up in shared libgcc
-diff --git a/libgcc/configure b/libgcc/configure
+diff -NBaur gcc-12.1.0/libgcc/configure gcc-12.1.0-dkppc/libgcc/configure
-index 4919a56f518..546b3413deb 100755
+--- gcc-12.1.0/libgcc/configure	2022-05-06 08:30:59.000000000 +0100
---- a/libgcc/configure
++++ gcc-12.1.0-dkppc/libgcc/configure	2022-05-06 19:17:44.792941894 +0100
-+++ b/libgcc/configure
+@@ -5689,6 +5689,7 @@
-@@ -5679,6 +5679,7 @@ tm_file="${tm_file_}"
  case $target_thread_file in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
@@ -851,11 +835,10 @@ index 4919a56f518..546b3413deb 100755
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+diff -NBaur gcc-12.1.0/libgcc/crtstuff.c gcc-12.1.0-dkppc/libgcc/crtstuff.c
-index 675930db043..bdfd6f6b0bb 100644
+--- gcc-12.1.0/libgcc/crtstuff.c	2022-05-06 08:30:59.000000000 +0100
---- a/libgcc/crtstuff.c
++++ gcc-12.1.0-dkppc/libgcc/crtstuff.c	2022-05-06 19:17:44.792941894 +0100
-+++ b/libgcc/crtstuff.c
+@@ -325,7 +325,7 @@
-@@ -325,7 +325,7 @@ register_tm_clones (void)
  
  #ifdef OBJECT_FORMAT_ELF
  
@@ -864,11 +847,10 @@ index 675930db043..bdfd6f6b0bb 100644
  /* Declare the __dso_handle variable.  It should have a unique value
     in every shared-object; in a main program its value is zero.  The
     object should in any case be protected.  This means the instance
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+diff -NBaur gcc-12.1.0/libstdc++-v3/configure gcc-12.1.0-dkppc/libstdc++-v3/configure
-index 326a279c54f..d2cb9d18294 100755
+--- gcc-12.1.0/libstdc++-v3/configure	2022-05-06 08:31:00.000000000 +0100
---- a/libstdc++-v3/configure
++++ gcc-12.1.0-dkppc/libstdc++-v3/configure	2022-05-06 19:17:44.801106712 +0100
-+++ b/libstdc++-v3/configure
+@@ -15765,6 +15765,7 @@
-@@ -15698,6 +15698,7 @@ $as_echo "$target_thread_file" >&6; }
  case $target_thread_file in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
@@ -876,43 +858,3 @@ index 326a279c54f..d2cb9d18294 100755
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
- 
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
- 

dkppc/scripts/build-gcc.sh

@@ -12,7 +12,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
 	--prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \
 	--disable-werror \
 	--enable-poison-system-directories \
@@ -48,7 +48,7 @@ cd mn10200/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$MN_BINUTILS_VER/configure \
+	../../binutils-$MN_BINUTILS_VER/configure \
 	--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
 	--disable-multilib \
 	--disable-werror $CROSS_PARAMS \
@@ -78,9 +78,6 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -101,7 +98,7 @@ then
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 40" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 41" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
 	$EXTRA_GCC_PARAMS \

select_toolchain.sh

@@ -30,8 +30,8 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=11.2.0
+    GCC_VER=12.1.0
-    BINUTILS_VER=2.37
+    BINUTILS_VER=2.38
     NEWLIB_VER=4.2.0.20211231
     basedir='dkarm-eabi'
     package=devkitARM
@@ -39,7 +39,7 @@ case "$VERSION" in
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=11.2.0
+    GCC_VER=12.1.0
     BINUTILS_VER=2.37
     MN_BINUTILS_VER=2.24
     NEWLIB_VER=4.2.0.20211231
@@ -49,7 +49,7 @@ case "$VERSION" in
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=11.2.0
+    GCC_VER=12.1.0
     BINUTILS_VER=2.32
     NEWLIB_VER=4.2.0.20211231
     basedir='dka64'