devkitARM: fix dynamic reent

prevent hard dependency on findfp
devkitARM: newlib add symlink support
2026-08-21 09:54:03 -05:00 · 2023-05-01 16:24:23 +01:00 · 2023-05-01 16:21:39 +01:00 · 2023-05-01 16:21:38 +01:00 · 2023-05-01 16:21:38 +01:00 · 2023-05-01 16:21:33 +01:00
19 changed files with 28091 additions and 18554 deletions
--- a/README.TXT
+++ b/README.TXT
@@ -24,9 +24,9 @@ For building gcc libgmp, libmpfr and libmpc are required - these are built as
 static libraries to make packaging simpler. If you're building the tools for
 personal use then the versions packaged by your chosen distro should suffice.
-http://gmplib.org/
+https://gmplib.org/
-http://www.mpfr.org/
+https://www.mpfr.org/
-http://www.multiprecision.org/
+https://www.multiprecision.org/
 sudo apt-get install libgmp-dev libmpfr-dev libmpc-dev
@@ -34,10 +34,10 @@ Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib,
 expat, and libusb. Again these are built as static libraries for ease of
 packaging but you can probably use the versions supplied by your distro.
-http://freeimage.sourceforge.net/
+https://freeimage.sourceforge.net/
-http://www.zlib.net
+https://www.zlib.net
-http://www.libusb.org
+https://www.libusb.org
-http://expat.sourceforge.net/
+https://expat.sourceforge.net/
 sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 59
+#	devkitARM release 61
-#	devkitPPC release 41
+#	devkitPPC release 43
-#	devkitA64 release 19
+#	devkitA64 release 21
 #---------------------------------------------------------------------------------
 if [ 0 -eq 1 ] ; then
@@ -27,10 +27,10 @@ echo
-DKARM_RULES_VER=1.2.1
+DKARM_RULES_VER=1.3.0
-DKARM_CRTLS_VER=1.1.1
+DKARM_CRTLS_VER=1.2.1
-DKPPC_RULES_VER=1.1.0
+DKPPC_RULES_VER=1.1.2
 DKA64_RULES_VER=1.0.1
--- a/dka64/patches/gcc-12.2.0.patch
+++ b/dka64/patches/gcc-12.2.0.patch
@@ -1,7 +1,56 @@
-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
+diff --git a/gcc/config.gcc b/gcc/config.gcc
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc	2022-04-29 14:58:22.000000000 +0100
+index c5064dd3766..decfa78fb7b 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc	2022-05-02 21:50:30.090088643 +0100
+--- a/gcc/config.gcc
-@@ -19417,8 +19417,24 @@
+++ b/gcc/config.gcc
@@ -1093,7 +1093,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/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
 index d4d820a9d54..ed5dd440846 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 93572fe8330..9327c52a819 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.cc b/gcc/config/aarch64/aarch64.cc
 index 5c9e7791a12..718db155d57 100644
 --- a/gcc/config/aarch64/aarch64.cc
 +++ b/gcc/config/aarch64/aarch64.cc
@@ -19413,8 +19413,24 @@ aarch64_load_tp (rtx target)
       || !register_operand (target, Pmode))
     target = gen_reg_rtx (Pmode);
@@ -28,21 +77,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-2
   return target;
 }
-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
+diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h	2022-04-29 14:58:22.000000000 +0100
+index 359b6e8561f..f5b596fc312 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h	2022-05-02 21:50:30.086094234 +0100
+--- a/gcc/config/aarch64/aarch64.h
-@@ -22,6 +22,7 @@
+++ b/gcc/config/aarch64/aarch64.h
- #ifndef GCC_AARCH64_ELF_RAW_H
+@@ -1245,6 +1245,10 @@ typedef struct
 #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)
@@ -53,7 +92,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20
 extern enum aarch64_code_model aarch64_cmodel;
 /* When using the tiny addressing model conditional and unconditional branches
-@@ -1290,7 +1294,7 @@
+@@ -1290,7 +1294,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
 #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
   { "rewrite_mcpu", aarch64_rewrite_mcpu },
@@ -62,10 +101,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20
 extern const char *host_detect_local_cpu (int argc, const char **argv);
 #define HAVE_LOCAL_CPU_DETECT
 # define EXTRA_SPEC_FUNCTIONS						\
-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
+diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md	2022-04-29 14:58:22.000000000 +0100
+index 34b8059b45b..4debacf3cb9 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md	2022-05-02 21:50:30.090088643 +0100
+--- a/gcc/config/aarch64/aarch64.md
-@@ -6899,11 +6899,22 @@
+++ b/gcc/config/aarch64/aarch64.md
@@ -6906,11 +6906,22 @@
 (define_insn "aarch64_load_tp_hard"
   [(set (match_operand:DI 0 "register_operand" "=r")
 	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -90,10 +130,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-2
 ;; 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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
+diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt	2022-04-29 14:58:22.000000000 +0100
+index 92220b26ee2..68abc1764f6 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt	2022-05-02 21:50:30.090088643 +0100
+--- a/gcc/config/aarch64/aarch64.opt
-@@ -122,6 +122,21 @@
+++ b/gcc/config/aarch64/aarch64.opt
@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
 EnumValue
 Enum(aarch64_tls_size) String(48) Value(48)
@@ -115,7 +156,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
 march=
 Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
 Use features of architecture ARCH.
-@@ -260,7 +275,7 @@
+@@ -260,7 +275,7 @@ TargetVariable
 long aarch64_stack_protector_guard_offset = 0
 moutline-atomics
@@ -124,26 +165,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
 Generate local calls to out-of-line atomic operations.
 -param=aarch64-sve-compare-costs=
-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
+diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h	2022-04-29 14:58:22.000000000 +0100
+index ba74abc0a43..5202ec05d0b 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h	2022-05-02 21:50:30.086094234 +0100
+--- a/gcc/config/aarch64/t-aarch64
-@@ -48,6 +48,12 @@
+++ b/gcc/config/aarch64/t-aarch64
-   TLS_DESCRIPTORS
+@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
 };
 +/* 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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
 --- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64	2022-04-29 14:58:22.000000000 +0100
 +++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64	2022-05-02 21:50:30.090088643 +0100
@@ -177,8 +177,10 @@
 		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
 comma=,
@@ -156,10 +182,12 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20
 insn-conditions.md: s-check-sve-md
 s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
-diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
+diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h	1970-01-01 01:00:00.000000000 +0100
+new file mode 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h	2022-05-02 22:04:49.962851033 +0100
+index 00000000000..a25459e4352
-@@ -0,0 +1,29 @@
+--- /dev/null
 +++ b/gcc/config/devkitpro.h
@@ -0,0 +1,32 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -188,10 +216,15 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
 +        builtin_define ("__DEVKITPRO__");       \
 +    } 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
+
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt	2022-05-02 21:50:30.090088643 +0100
+diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
 new file mode 100644
 index 00000000000..9acbbf9d27c
 --- /dev/null
 +++ b/gcc/config/devkitpro.opt
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
@@ -222,10 +255,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-202204
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
-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
+diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
+index 3b0d83ffc60..6e063b6ccd0 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc	2022-05-02 21:50:30.090088643 +0100
+--- a/gcc/config/i386/host-mingw32.cc
-@@ -45,7 +45,11 @@
+++ b/gcc/config/i386/host-mingw32.cc
@@ -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?  */
@@ -237,28 +271,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC
 /* Granularity for reserving address space.  */
 static size_t va_granularity = 0x10000;
-diff -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
--- gcc-12.1.0-RC-20220429/gcc/config.gcc	2022-04-29 14:58:22.000000000 +0100
+index bb07cc244e3..eff31f5093d 100644
-+++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc	2022-05-02 21:50:30.086094234 +0100
+--- a/gcc/gcc.cc
-@@ -1093,7 +1093,14 @@
+++ b/gcc/gcc.cc
- 	tmake_file="${tmake_file} aarch64/t-aarch64"
+@@ -860,6 +860,11 @@ proper position among the other output files.  */
 	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
@@ -270,7 +287,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
 /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC  \
-@@ -1204,6 +1209,7 @@
+@@ -1204,6 +1209,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -278,7 +295,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
 static const char *endfile_spec = ENDFILE_SPEC;
 static const char *startfile_spec = STARTFILE_SPEC;
 static const char *linker_name_spec = LINKER_NAME;
-@@ -1709,6 +1715,7 @@
+@@ -1709,6 +1715,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -286,10 +303,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
   INIT_STATIC_SPEC ("version",			&compiler_version),
-diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
+index b98b86a5a88..3f62b3616d2 100644
-+++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c	2022-05-02 21:50:30.094083051 +0100
+--- a/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@
+++ b/libgcc/crtstuff.c
@@ -325,7 +325,7 @@ register_tm_clones (void)
 #ifdef OBJECT_FORMAT_ELF
@@ -298,10 +316,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka6
 /* 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 -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
+diff --git a/libgcc/gthr.h b/libgcc/gthr.h
--- gcc-12.1.0-RC-20220429/libgcc/gthr.h	2022-04-29 14:58:25.000000000 +0100
+index 7943c94f6d1..6d23362f7f0 100644
-+++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h	2022-05-02 21:50:30.094083051 +0100
+--- a/libgcc/gthr.h
-@@ -136,7 +136,7 @@
+++ b/libgcc/gthr.h
@@ -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.  */
@@ -310,10 +329,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/li
 #undef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 0
 #endif
-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
+diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am	2022-04-29 14:58:26.000000000 +0100
+index 7708f4cf6c5..d3f484a5623 100644
-+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am	2022-05-02 21:50:30.094083051 +0100
+--- a/libstdc++-v3/include/Makefile.am
-@@ -1366,6 +1366,7 @@
+++ b/libstdc++-v3/include/Makefile.am
@@ -1366,6 +1366,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' \
@@ -321,10 +341,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-R
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
-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
+diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in	2022-04-29 14:58:26.000000000 +0100
+index 7023c2de23e..d150a616d13 100644
-+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in	2022-05-02 21:50:30.094083051 +0100
+--- a/libstdc++-v3/include/Makefile.in
-@@ -1857,6 +1857,7 @@
+++ b/libstdc++-v3/include/Makefile.in
@@ -1857,6 +1857,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' \
--- a/dka64/patches/newlib-4.3.0.20230120.patch
+++ b/dka64/patches/newlib-4.3.0.20230120.patch
--- a/dka64/scripts/build-gcc.sh
+++ b/dka64/scripts/build-gcc.sh
@@ -62,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 19" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 21" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		$EXTRA_GCC_PARAMS \
--- a/dkarm-eabi/patches/gcc-12.2.0.patch
+++ b/dkarm-eabi/patches/gcc-12.2.0.patch
@@ -1,7 +1,24 @@
-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
+diff --git a/gcc/config.gcc b/gcc/config.gcc
--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in	2022-04-29 14:58:22.000000000 +0100
+index c5064dd3766..b244608f001 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in	2022-04-30 13:31:09.120134164 +0100
+--- a/gcc/config.gcc
-@@ -412,7 +412,7 @@
+++ b/gcc/config.gcc
@@ -1366,6 +1366,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
 	  tm_file="$tm_file newlib-stdint.h"
 	  tmake_file="${tmake_file} arm/t-bpabi"
 	  use_gcc_stdint=wrap
 +	  tm_file="${tm_file} devkitpro.h"
 +	  extra_options="${extra_options} devkitpro.opt"
 +	  case ${enable_threads} in
 +		"" | yes | posix) thread_file='posix' ;;
 +	  esac
 	  ;;
 	arm*-*-fuchsia*)
 	  tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
 index 0d3082b569f..15be7fc47b3 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
@@ -412,7 +412,7 @@ begin arch armv6k
  tune for mpcore
  tune flags CO_PROC
  base 6K
@@ -10,16 +27,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-2022
  option fp add VFPv2 FP_DBL
  optalias vfpv2 fp
  option nofp remove ALL_FP
-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
+diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf	2022-04-29 14:58:22.000000000 +0100
+index 1459afea921..72e1d20861d 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf	2022-04-30 13:31:39.759455398 +0100
+--- a/gcc/config/arm/t-arm-elf
-@@ -1,4 +1,4 @@
+++ b/gcc/config/arm/t-arm-elf
-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
+@@ -16,120 +16,22 @@
 +# 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/>.
@@ -69,8 +81,8 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
 -
 -MULTILIB_OPTIONS     =
 -MULTILIB_DIRNAMES    =
-+MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k mfloat-abi=hard
+MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
-+MULTILIB_DIRNAMES    = thumb be armv6k fpu
+MULTILIB_DIRNAMES    = thumb be armv6k v6-m fpu nofp
 MULTILIB_EXCEPTIONS  = 
 MULTILIB_MATCHES     =
 -MULTILIB_REUSE	     =
@@ -117,25 +129,31 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
 -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_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
 -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, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
 -# PART 4 - Reuse rules
 +MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
 +MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
 -# PART 4 - Reuse rules
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m1
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m1
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
 -MULTILIB_REUSE	     += mthumb=mthumb/march.armv5te+fp
@@ -145,9 +163,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
 -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 -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
+MULTILIB_REUSE       = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h	2022-04-29 14:58:22.000000000 +0100
+diff --git a/gcc/config/arm/unknown-elf.h b/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
+index bfb294beaa3..7e2e1c7bbbe 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
@@ -29,7 +29,7 @@
 #endif
@@ -164,10 +184,79 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20
 -#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 -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
+diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
+new file mode 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc	2022-04-30 13:31:09.120134164 +0100
+index 00000000000..180a9ea8553
-@@ -45,7 +45,11 @@
+--- /dev/null
 +++ b/gcc/config/devkitpro.h
@@ -0,0 +1,27 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 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.
 +   Under Section 7 of GPL version 3, you are granted additional
 +   permissions described in the GCC Runtime Library Exception, version
 +   3.1, as published by the Free Software Foundation.
 +   You should have received a copy of the GNU General Public License and
 +   a copy of the GCC Runtime Library Exception along with this program;
 +   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +   <http://www.gnu.org/licenses/>.  */
 +
 +#undef TARGET_OS_CPP_BUILTINS
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITPRO__");       \
 +        builtin_define ("__DEVKITARM__");       \
 +    } while (0)
 +
 +
 diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
 new file mode 100644
 index 00000000000..9acbbf9d27c
 --- /dev/null
 +++ b/gcc/config/devkitpro.opt
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
 +; Copyright (C) 2011-2018 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/>.
 +
 +; See the GCC internals manual (options.texi) for a description of
 +; this file's format.
 +
 +; Please try to keep this file in ASCII collating order.
 +
 +pthread
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
 diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
 index 3b0d83ffc60..6e063b6ccd0 100644
 --- a/gcc/config/i386/host-mingw32.cc
 +++ b/gcc/config/i386/host-mingw32.cc
@@ -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?  */
@@ -179,10 +268,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC
 /* Granularity for reserving address space.  */
 static size_t va_granularity = 0x10000;
-diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
+index bb07cc244e3..eff31f5093d 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc	2022-04-30 13:31:09.120134164 +0100
+--- a/gcc/gcc.cc
-@@ -860,6 +860,11 @@
+++ b/gcc/gcc.cc
@@ -860,6 +860,11 @@ proper position among the other output files.  */
 #endif
 #endif
@@ -194,7 +284,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/g
 /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC  \
-@@ -1204,6 +1209,7 @@
+@@ -1204,6 +1209,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -202,7 +292,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/g
 static const char *endfile_spec = ENDFILE_SPEC;
 static const char *startfile_spec = STARTFILE_SPEC;
 static const char *linker_name_spec = LINKER_NAME;
-@@ -1709,6 +1715,7 @@
+@@ -1709,6 +1715,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -210,19 +300,21 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/g
   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
   INIT_STATIC_SPEC ("version",			&compiler_version),
-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
+diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi	2022-04-29 14:58:25.000000000 +0100
+index dddddc7c444..c2502597953 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi	2022-04-30 13:31:09.120134164 +0100
+--- a/libgcc/config/arm/t-bpabi
-@@ -17,4 +17,4 @@
+++ b/libgcc/config/arm/t-bpabi
@@ -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 -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
+index b98b86a5a88..3f62b3616d2 100644
-+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c	2022-04-30 13:31:09.120134164 +0100
+--- a/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@
+++ b/libgcc/crtstuff.c
@@ -325,7 +325,7 @@ register_tm_clones (void)
 #ifdef OBJECT_FORMAT_ELF
@@ -231,3 +323,48 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkar
 /* 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
 index 7943c94f6d1..1edc5360f6a 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
@@ -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.  */
 -#ifdef __MINGW32__
 +#ifdef __MINGW32__ || defined(__DEVKITARM__)
 #undef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 0
 #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
 index 7708f4cf6c5..01743392303 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
@@ -1366,6 +1366,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' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
 index 7023c2de23e..33bec80c2ce 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
@@ -336,6 +336,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 python_mod_dir = @python_mod_dir@
 +runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1857,6 +1858,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' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
--- a/dkarm-eabi/patches/gcc-13.1.0-RC2-20230419.patch
+++ b/dkarm-eabi/patches/gcc-13.1.0-RC2-20230419.patch
@@ -0,0 +1,340 @@
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/arm-cpus.in gcc-13.1.0-RC2-20230419/gcc/config/arm/arm-cpus.in
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/arm-cpus.in	2023-04-19 13:53:45.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config/arm/arm-cpus.in	2023-04-26 21:53:20.092320569 +0100
@@ -416,7 +416,7 @@
  tune for mpcore
  tune flags CO_PROC
  base 6K
 - isa ARMv6k
 + isa ARMv6k VFPv2 FP_DBL
  option fp add VFPv2 FP_DBL
  optalias vfpv2 fp
  option nofp remove ALL_FP
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/t-arm-elf gcc-13.1.0-RC2-20230419/gcc/config/arm/t-arm-elf
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/t-arm-elf	2023-04-19 13:53:45.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config/arm/t-arm-elf	2023-04-26 21:53:20.092320569 +0100
@@ -16,120 +16,22 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 -# Build a very basic set of libraries that should cater for most cases.
 -
 -# Single-precision floating-point is NOT supported; we don't build a
 -# suitable library for that.  Use the rm-profile config in that case.
 -
 -# PART 1 - Useful groups of options
 -
 -dp_fpus		:= vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
 -		   neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
 -		   fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
 -		   vfp3
 -
 -sp_fpus		:= vfpv3xd vfpv3xd-fp16  fpv4-sp-d16 fpv5-sp-d16
 -
 -v7a_fps		:= vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
 -v7ve_fps	:= vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
 -		   neon-fp16 simd
 -
 -# Not all these permutations exist for all architecture variants, but
 -# 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
 -
 -all_early_arch	:= armv5tej armv6 armv6j armv6k armv6z armv6kz \
 -		   armv6zk armv6t2 iwmmxt iwmmxt2
 -
 -all_v7_a_r	:= armv7-a armv7ve armv7-r
 -
 -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
 -
 -all_nofp_t2	:= armv7-m
 -
 -all_sp_only	:= armv7e-m armv8-m.main
 -
 -MULTILIB_OPTIONS     =
 -MULTILIB_DIRNAMES    =
 +MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
 +MULTILIB_DIRNAMES    = thumb be armv6k v6-m fpu nofp
 MULTILIB_EXCEPTIONS  = 
 MULTILIB_MATCHES     =
 -MULTILIB_REUSE	     =
 -
 -# PART 2 - multilib build rules
 -
 -MULTILIB_OPTIONS     += marm/mthumb
 -MULTILIB_DIRNAMES    += arm thumb
 -
 -MULTILIB_OPTIONS     += mfpu=auto
 -MULTILIB_DIRNAMES    += autofp
 -
 -MULTILIB_OPTIONS     += march=armv5te+fp/march=armv7+fp
 -MULTILIB_DIRNAMES    += v5te v7
 -
 -MULTILIB_OPTIONS     += mfloat-abi=hard
 -MULTILIB_DIRNAMES    += fpu
 -
 -# Build a total of 4 library variants (base options plus the following):
 -MULTILIB_REQUIRED    += mthumb
 -MULTILIB_REQUIRED    += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
 -MULTILIB_REQUIRED    += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
 -
 -# PART 3 - Match rules
 -
 -# Map all supported FPUs onto mfpu=auto
 -MULTILIB_MATCHES     += $(foreach FPU, $(dp_fpus), \
 -			  mfpu?auto=mfpu?$(FPU))
 -
 -MULTILIB_MATCHES     += march?armv5te+fp=march?armv5te
 -
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_early_arch), \
 -		          march?armv5te+fp=march?$(ARCH) \
 -			  march?armv5te+fp=march?$(ARCH)+fp)
 -
 -MULTILIB_MATCHES     += march?armv7+fp=march?armv7
 -
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7a_fps), \
 -		          march?armv7+fp=march?armv7-a+$(FPARCH))
 -
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7ve_fps), \
 -		          march?armv7+fp=march?armv7ve+$(FPARCH))
 -
 -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_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v9_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
 +MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
 +MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
 -# PART 4 - Reuse rules
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m1
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m1
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
 -MULTILIB_REUSE	     += mthumb=mthumb/march.armv5te+fp
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
 -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
 +MULTILIB_REUSE       = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/unknown-elf.h gcc-13.1.0-RC2-20230419/gcc/config/arm/unknown-elf.h
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config/arm/unknown-elf.h	2023-04-19 13:53:45.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config/arm/unknown-elf.h	2023-04-26 21:53:20.092320569 +0100
@@ -29,7 +29,7 @@
 #endif
 /* Now we define the strings used to build the spec file.  */
 -#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s crt0%O%s"
 +#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s"
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC	\
@@ -93,4 +93,5 @@
    udivmoddi4, which will depend on the exception unwind routines,
    which will depend on abort, which is defined in libc.  */ 
 #undef LINK_GCC_C_SEQUENCE_SPEC
 -#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 -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config/devkitpro.h gcc-13.1.0-RC2-20230419/gcc/config/devkitpro.h
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config/devkitpro.h	1970-01-01 01:00:00.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config/devkitpro.h	2023-04-26 21:53:20.092320569 +0100
@@ -0,0 +1,27 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 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.
 +   Under Section 7 of GPL version 3, you are granted additional
 +   permissions described in the GCC Runtime Library Exception, version
 +   3.1, as published by the Free Software Foundation.
 +   You should have received a copy of the GNU General Public License and
 +   a copy of the GCC Runtime Library Exception along with this program;
 +   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +   <http://www.gnu.org/licenses/>.  */
 +
 +#undef TARGET_OS_CPP_BUILTINS
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITPRO__");       \
 +        builtin_define ("__DEVKITARM__");       \
 +    } while (0)
 +
 +
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config/devkitpro.opt gcc-13.1.0-RC2-20230419/gcc/config/devkitpro.opt
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config/devkitpro.opt	1970-01-01 01:00:00.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config/devkitpro.opt	2023-04-26 21:53:20.092320569 +0100
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
 +; Copyright (C) 2011-2018 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/>.
 +
 +; See the GCC internals manual (options.texi) for a description of
 +; this file's format.
 +
 +; Please try to keep this file in ASCII collating order.
 +
 +pthread
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/config.gcc gcc-13.1.0-RC2-20230419/gcc/config.gcc
 --- gcc-13.1.0-RC2-20230419.orig/gcc/config.gcc	2023-04-19 13:53:45.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/config.gcc	2023-04-26 21:53:20.092320569 +0100
@@ -1412,6 +1412,11 @@
 	  tm_file="$tm_file newlib-stdint.h"
 	  tmake_file="${tmake_file} arm/t-bpabi"
 	  use_gcc_stdint=wrap
 +	  tm_file="${tm_file} devkitpro.h"
 +	  extra_options="${extra_options} devkitpro.opt"
 +	  case ${enable_threads} in
 +		"" | yes | posix) thread_file='posix' ;;
 +	  esac
 	  ;;
 	arm*-*-fuchsia*)
 	  tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/gcc/gcc.cc gcc-13.1.0-RC2-20230419/gcc/gcc.cc
 --- gcc-13.1.0-RC2-20230419.orig/gcc/gcc.cc	2023-04-19 13:53:46.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/gcc/gcc.cc	2023-04-26 21:53:20.092320569 +0100
@@ -868,6 +868,11 @@
 #endif
 #endif
 +#ifndef LIBGLOSS_SPEC
 +# define LIBGLOSS_SPEC "-lsysbase"
 +#endif
 +
 +
 /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC  \
@@ -1191,6 +1196,7 @@
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
 +static const char *libgloss_spec = LIBGLOSS_SPEC;
 static const char *endfile_spec = ENDFILE_SPEC;
 static const char *startfile_spec = STARTFILE_SPEC;
 static const char *linker_name_spec = LINKER_NAME;
@@ -1701,6 +1707,7 @@
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
 +  INIT_STATIC_SPEC ("libgloss",			&libgloss_spec),
   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
   INIT_STATIC_SPEC ("version",			&compiler_version),
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/libgcc/config/arm/t-bpabi gcc-13.1.0-RC2-20230419/libgcc/config/arm/t-bpabi
 --- gcc-13.1.0-RC2-20230419.orig/libgcc/config/arm/t-bpabi	2023-04-19 13:53:49.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/libgcc/config/arm/t-bpabi	2023-04-26 21:53:20.092320569 +0100
@@ -17,4 +17,4 @@
 # 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 -NBaur gcc-13.1.0-RC2-20230419.orig/libgcc/crtstuff.c gcc-13.1.0-RC2-20230419/libgcc/crtstuff.c
 --- gcc-13.1.0-RC2-20230419.orig/libgcc/crtstuff.c	2023-04-19 13:53:49.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/libgcc/crtstuff.c	2023-04-26 21:53:20.092320569 +0100
@@ -326,7 +326,7 @@
 #ifdef OBJECT_FORMAT_ELF
 -#if DEFAULT_USE_CXA_ATEXIT
 +#if 1 /* DEFAULT_USE_CXA_ATEXIT */
 /* 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 -NBaur gcc-13.1.0-RC2-20230419.orig/libgcc/gthr.h gcc-13.1.0-RC2-20230419/libgcc/gthr.h
 --- gcc-13.1.0-RC2-20230419.orig/libgcc/gthr.h	2023-04-19 13:53:49.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/libgcc/gthr.h	2023-04-26 21:53:20.092320569 +0100
@@ -136,7 +136,7 @@
 /* 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.  */
 -#ifdef __MINGW32__
 +#ifdef __MINGW32__ || defined(__DEVKITARM__)
 #undef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 0
 #endif
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/libstdc++-v3/include/Makefile.am gcc-13.1.0-RC2-20230419/libstdc++-v3/include/Makefile.am
 --- gcc-13.1.0-RC2-20230419.orig/libstdc++-v3/include/Makefile.am	2023-04-19 13:53:50.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/libstdc++-v3/include/Makefile.am	2023-04-26 21:53:20.092320569 +0100
@@ -1417,6 +1417,7 @@
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 diff -NBaur gcc-13.1.0-RC2-20230419.orig/libstdc++-v3/include/Makefile.in gcc-13.1.0-RC2-20230419/libstdc++-v3/include/Makefile.in
 --- gcc-13.1.0-RC2-20230419.orig/libstdc++-v3/include/Makefile.in	2023-04-19 13:53:50.000000000 +0100
 +++ gcc-13.1.0-RC2-20230419/libstdc++-v3/include/Makefile.in	2023-04-26 21:53:20.092320569 +0100
@@ -336,6 +336,7 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 python_mod_dir = @python_mod_dir@
 +runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1891,6 +1892,7 @@
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
--- a/dkarm-eabi/patches/gcc-13.1.0.patch
+++ b/dkarm-eabi/patches/gcc-13.1.0.patch
@@ -0,0 +1,354 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
 index 6fd1594480a..92b82426f50 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
@@ -1412,6 +1412,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
 	  tm_file="$tm_file newlib-stdint.h"
 	  tmake_file="${tmake_file} arm/t-bpabi"
 	  use_gcc_stdint=wrap
 +	  tm_file="${tm_file} devkitpro.h"
 +	  extra_options="${extra_options} devkitpro.opt"
 +	  case ${enable_threads} in
 +		"" | yes | posix) thread_file='posix' ;;
 +	  esac
 	  ;;
 	arm*-*-fuchsia*)
 	  tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
 index f1fa3fa174c..2bb894b5b2d 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
@@ -416,7 +416,7 @@ begin arch armv6k
  tune for mpcore
  tune flags CO_PROC
  base 6K
 - isa ARMv6k
 + isa ARMv6k VFPv2 FP_DBL
  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
 index f7fc1460d1c..055f9d62385 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
@@ -16,120 +16,22 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 -# Build a very basic set of libraries that should cater for most cases.
 -
 -# Single-precision floating-point is NOT supported; we don't build a
 -# suitable library for that.  Use the rm-profile config in that case.
 -
 -# PART 1 - Useful groups of options
 -
 -dp_fpus		:= vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
 -		   neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
 -		   fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
 -		   vfp3
 -
 -sp_fpus		:= vfpv3xd vfpv3xd-fp16  fpv4-sp-d16 fpv5-sp-d16
 -
 -v7a_fps		:= vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
 -v7ve_fps	:= vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
 -		   neon-fp16 simd
 -
 -# Not all these permutations exist for all architecture variants, but
 -# 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
 -
 -all_early_arch	:= armv5tej armv6 armv6j armv6k armv6z armv6kz \
 -		   armv6zk armv6t2 iwmmxt iwmmxt2
 -
 -all_v7_a_r	:= armv7-a armv7ve armv7-r
 -
 -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
 -
 -all_nofp_t2	:= armv7-m
 -
 -all_sp_only	:= armv7e-m armv8-m.main
 -
 -MULTILIB_OPTIONS     =
 -MULTILIB_DIRNAMES    =
 +MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
 +MULTILIB_DIRNAMES    = thumb be armv6k v6-m fpu nofp
 MULTILIB_EXCEPTIONS  = 
 MULTILIB_MATCHES     =
 -MULTILIB_REUSE	     =
 -
 -# PART 2 - multilib build rules
 -
 -MULTILIB_OPTIONS     += marm/mthumb
 -MULTILIB_DIRNAMES    += arm thumb
 -
 -MULTILIB_OPTIONS     += mfpu=auto
 -MULTILIB_DIRNAMES    += autofp
 -
 -MULTILIB_OPTIONS     += march=armv5te+fp/march=armv7+fp
 -MULTILIB_DIRNAMES    += v5te v7
 -
 -MULTILIB_OPTIONS     += mfloat-abi=hard
 -MULTILIB_DIRNAMES    += fpu
 -
 -# Build a total of 4 library variants (base options plus the following):
 -MULTILIB_REQUIRED    += mthumb
 -MULTILIB_REQUIRED    += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
 -MULTILIB_REQUIRED    += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
 -
 -# PART 3 - Match rules
 -
 -# Map all supported FPUs onto mfpu=auto
 -MULTILIB_MATCHES     += $(foreach FPU, $(dp_fpus), \
 -			  mfpu?auto=mfpu?$(FPU))
 -
 -MULTILIB_MATCHES     += march?armv5te+fp=march?armv5te
 -
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_early_arch), \
 -		          march?armv5te+fp=march?$(ARCH) \
 -			  march?armv5te+fp=march?$(ARCH)+fp)
 -
 -MULTILIB_MATCHES     += march?armv7+fp=march?armv7
 -
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7a_fps), \
 -		          march?armv7+fp=march?armv7-a+$(FPARCH))
 -
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7ve_fps), \
 -		          march?armv7+fp=march?armv7ve+$(FPARCH))
 -
 -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_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v9_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
 +MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
 +MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
 -# PART 4 - Reuse rules
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0plus
 +MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m1
 +MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m1
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
 -MULTILIB_REUSE	     += mthumb=mthumb/march.armv5te+fp
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
 -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
 +MULTILIB_REUSE       = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
 diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
 index 397ac3f68b9..b9a388f19be 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
@@ -29,7 +29,7 @@
 #endif
 /* Now we define the strings used to build the spec file.  */
 -#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s crt0%O%s"
 +#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s"
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC	\
@@ -93,4 +93,5 @@
    udivmoddi4, which will depend on the exception unwind routines,
    which will depend on abort, which is defined in libc.  */ 
 #undef LINK_GCC_C_SEQUENCE_SPEC
 -#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/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
 index 00000000000..180a9ea8553
 --- /dev/null
 +++ b/gcc/config/devkitpro.h
@@ -0,0 +1,27 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 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.
 +   Under Section 7 of GPL version 3, you are granted additional
 +   permissions described in the GCC Runtime Library Exception, version
 +   3.1, as published by the Free Software Foundation.
 +   You should have received a copy of the GNU General Public License and
 +   a copy of the GCC Runtime Library Exception along with this program;
 +   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +   <http://www.gnu.org/licenses/>.  */
 +
 +#undef TARGET_OS_CPP_BUILTINS
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITPRO__");       \
 +        builtin_define ("__DEVKITARM__");       \
 +    } while (0)
 +
 +
 diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
 new file mode 100644
 index 00000000000..9acbbf9d27c
 --- /dev/null
 +++ b/gcc/config/devkitpro.opt
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
 +; Copyright (C) 2011-2018 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/>.
 +
 +; See the GCC internals manual (options.texi) for a description of
 +; this file's format.
 +
 +; Please try to keep this file in ASCII collating order.
 +
 +pthread
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 16bb07f2cdc..22a181a3a1c 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -868,6 +868,11 @@ proper position among the other output files.  */
 #endif
 #endif
 +#ifndef LIBGLOSS_SPEC
 +# define LIBGLOSS_SPEC "-lsysbase"
 +#endif
 +
 +
 /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC  \
@@ -1191,6 +1196,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
 +static const char *libgloss_spec = LIBGLOSS_SPEC;
 static const char *endfile_spec = ENDFILE_SPEC;
 static const char *startfile_spec = STARTFILE_SPEC;
 static const char *linker_name_spec = LINKER_NAME;
@@ -1701,6 +1707,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
 +  INIT_STATIC_SPEC ("libgloss",			&libgloss_spec),
   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
 index dddddc7c444..c2502597953 100644
 --- a/libgcc/config/arm/t-bpabi
 +++ b/libgcc/config/arm/t-bpabi
@@ -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
 index 93ff5b81dc5..20c0fe89a28 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
@@ -326,7 +326,7 @@ register_tm_clones (void)
 #ifdef OBJECT_FORMAT_ELF
 -#if DEFAULT_USE_CXA_ATEXIT
 +#if 1 /* DEFAULT_USE_CXA_ATEXIT */
 /* 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
 index 1989c0c86ed..dc3220cdf3c 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
@@ -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.  */
 -#ifdef __MINGW32__
 +#ifdef __MINGW32__ || defined(__DEVKITARM__)
 #undef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 0
 #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
 index a880e8ee227..2050e2e4ccf 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
@@ -1417,6 +1417,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' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
 index 0ff875b280b..7d270fc3a83 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
@@ -336,6 +336,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 python_mod_dir = @python_mod_dir@
 +runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1891,6 +1892,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' \
 +	    -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
--- a/dkarm-eabi/patches/newlib-4.2.0.20211231.patch
+++ b/dkarm-eabi/patches/newlib-4.2.0.20211231.patch
--- a/dkarm-eabi/patches/newlib-4.3.0.20230120.patch
+++ b/dkarm-eabi/patches/newlib-4.3.0.20230120.patch
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/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 59" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 61" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
                $EXTRA_GCC_PARAMS \
--- a/dkppc/patches/binutils-2.37.patch
+++ b/dkppc/patches/binutils-2.37.patch
@@ -1,28 +0,0 @@
 diff -NBaur binutils-2.37/libiberty/rust-demangle.c binutils-2.37-new/libiberty/rust-demangle.c
 --- binutils-2.37/libiberty/rust-demangle.c	2021-07-15 15:19:46.000000000 +0100
 +++ binutils-2.37-new/libiberty/rust-demangle.c	2022-01-01 22:02:21.860422023 +0000
@@ -75,10 +75,10 @@
   int version;
   /* Recursion depth.  */
 -  uint recursion;
 +  unsigned recursion;
   /* Maximum number of times demangle_path may be called recursively.  */
 #define RUST_MAX_RECURSION_COUNT  1024
 -#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
 +#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
   uint64_t bound_lifetime_depth;
 };
 diff -NBaur binutils-2.37/opcodes/ppc-opc.c binutils-2.37-new/opcodes/ppc-opc.c
 --- binutils-2.37/opcodes/ppc-opc.c	2021-07-08 12:37:21.000000000 +0100
 +++ binutils-2.37-new/opcodes/ppc-opc.c	2022-01-01 22:02:04.409141184 +0000
@@ -4302,7 +4302,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
--- a/dkppc/patches/binutils-2.40.patch
+++ b/dkppc/patches/binutils-2.40.patch
@@ -0,0 +1,26 @@
 diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
 index da892988f5d..6b8efb9bbdb 100644
 --- a/ld/emulparams/elf32ppccommon.sh
 +++ b/ld/emulparams/elf32ppccommon.sh
@@ -23,7 +23,7 @@ else
   unset SBSS_START_SYMBOLS
   unset SBSS_END_SYMBOLS
 fi
 -OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
 +OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
 OTHER_RELRO_SECTIONS="
   .fixup        ${RELOCATING-0} : { *(.fixup) }
   .got1         ${RELOCATING-0} : { *(.got1) }
 diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
 index 37f1aeb780c..f8de8aacc44 100644
 --- a/opcodes/ppc-opc.c
 +++ b/opcodes/ppc-opc.c
@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
 #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
--- a/dkppc/patches/gcc-12.2.0.patch
+++ b/dkppc/patches/gcc-12.2.0.patch
@@ -0,0 +1,992 @@
 diff --git a/config/gthr.m4 b/config/gthr.m4
 index 4b937306ad0..bfd0375bd60 100644
 --- a/config/gthr.m4
 +++ b/config/gthr.m4
@@ -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 ;;
 +    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
     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.cc b/gcc/config/i386/host-mingw32.cc
 index 3b0d83ffc60..6e063b6ccd0 100644
 --- a/gcc/config/i386/host-mingw32.cc
 +++ b/gcc/config/i386/host-mingw32.cc
@@ -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?  */
 +#if __MINGW64__
 +static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
 +#else
 static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
 +#endif
 /* 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
 index 098f658e74f..50c74877deb 100644
 --- a/gcc/config/newlib-stdint.h
 +++ b/gcc/config/newlib-stdint.h
@@ -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
 -#define STDINT_LONG32 (LONG_TYPE_SIZE == 32)
 +#define STDINT_LONG32 0
 #endif
 #define SIG_ATOMIC_TYPE "int"
 diff --git a/gcc/config/rs6000/eabi.h b/gcc/config/rs6000/eabi.h
 index e58283fe5d4..161767b2b08 100644
 --- a/gcc/config/rs6000/eabi.h
 +++ b/gcc/config/rs6000/eabi.h
@@ -36,6 +36,8 @@
       builtin_assert ("system=embedded"); \
       builtin_assert ("cpu=powerpc");     \
       builtin_assert ("machine=powerpc"); \
 +      builtin_define ("__DEVKITPPC__");   \
 +      builtin_define ("__DEVKITPRO__");   \
       TARGET_OS_SYSV_CPP_BUILTINS ();     \
     }                                     \
   while (0)
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
 index bc48f450210..7ba76802670 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
@@ -199,6 +199,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.cc.  */
 +#if 0
 #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
 /* In driver-rs6000.cc.  */
 extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -210,6 +211,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 #else
 #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
 #endif
 +#endif
 +#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
 #ifndef CC1_CPU_SPEC
 #ifdef HAVE_LOCAL_CPU_DETECT
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
 index 7e2519de5d4..bedfaf31808 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -589,7 +589,11 @@ GNU_USER_TARGET_CC1_SPEC
 /* Default starting address if specified.  */
 #define LINK_START_SPEC "\
 -%{mads         : %(link_start_ads)         ; \
 +%{mgcn|mogc    : %(link_start_ogc)         ; \
 +  mvgc         : %(link_start_vgc)         ; \
 +  mgcbios      : %(link_start_gcb)         ; \
 +  mrvl         : %(link_start_rvl)         ; \
 +  mads         : %(link_start_ads)         ; \
   myellowknife : %(link_start_yellowknife) ; \
   mmvme        : %(link_start_mvme)        ; \
   msim         : %(link_start_sim)         ; \
@@ -620,7 +624,8 @@ GNU_USER_TARGET_CC1_SPEC
 /* Any specific OS flags.  */
 #define LINK_OS_SPEC "\
 -%{mads         : %(link_os_ads)         ; \
 +%{mgcn|mogc|mvgc|mgcbios|mrvl         : %(link_os_ogc)         ; \
 +  mads         : %(link_os_ads)         ; \
   myellowknife : %(link_os_yellowknife) ; \
   mmvme        : %(link_os_mvme)        ; \
   msim         : %(link_os_sim)         ; \
@@ -635,7 +640,10 @@ GNU_USER_TARGET_CC1_SPEC
 /* Override rs6000.h definition.  */
 #undef	CPP_SPEC
 #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
 -%{mads         : %(cpp_os_ads)         ; \
 +%{mgcn         : %(cpp_os_gcn)         ; \
 +  mogc|mvgc|mgcbios         : %(cpp_os_ogc)         ; \
 +  mrvl         : %(cpp_os_rvl)         ; \
 +  mads         : %(cpp_os_ads)         ; \
   myellowknife : %(cpp_os_yellowknife) ; \
   mmvme        : %(cpp_os_mvme)        ; \
   msim         : %(cpp_os_sim)         ; \
@@ -649,7 +657,10 @@ GNU_USER_TARGET_CC1_SPEC
 #undef	STARTFILE_SPEC
 #define	STARTFILE_SPEC "\
 -%{mads         : %(startfile_ads)         ; \
 +%{mgcn         : %(startfile_gcn)         ; \
 +  mogc|mvgc|mgcbios         : %(startfile_ogc)         ; \
 +  mrvl         : %(startfile_ogc)         ; \
 +  mads         : %(startfile_ads)         ; \
   myellowknife : %(startfile_yellowknife) ; \
   mmvme        : %(startfile_mvme)        ; \
   msim         : %(startfile_sim)         ; \
@@ -663,7 +674,8 @@ GNU_USER_TARGET_CC1_SPEC
 #undef	LIB_SPEC
 #define	LIB_SPEC "\
 -%{mads         : %(lib_ads)         ; \
 +%{mgcn|mogc|mvgc|mgcbios|mrvl        : %(lib_ogc)         ; \
 +  mads         : %(lib_ads)         ; \
   myellowknife : %(lib_yellowknife) ; \
   mmvme        : %(lib_mvme)        ; \
   msim         : %(lib_sim)         ; \
@@ -673,11 +685,12 @@ GNU_USER_TARGET_CC1_SPEC
   mcall-openbsd: %(lib_openbsd)     ; \
                : %(lib_default)     }"
 -#define LIB_DEFAULT_SPEC "-lc"
 +#define LIB_DEFAULT_SPEC "--start-group -lsysbase -lc --end-group"
 #undef	ENDFILE_SPEC
 #define	ENDFILE_SPEC "\
 -%{mads         : %(endfile_ads)         ; \
 +%{mgcn|mogc|mvgc|mgcbios|mrvl         : %(endfile_ogc)         ; \
 +  mads         : %(endfile_ads)         ; \
   myellowknife : %(endfile_yellowknife) ; \
   mmvme        : %(endfile_mvme)        ; \
   msim         : %(endfile_sim)         ; \
@@ -693,16 +706,27 @@ GNU_USER_TARGET_CC1_SPEC
 /* Motorola ADS support.  */
 #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
 +#define LIB_OGC_SPEC "--start-group -lsysbase -lc --end-group"
 #define	STARTFILE_ADS_SPEC "ecrti.o%s crt0.o%s crtbegin.o%s"
 +#define	STARTFILE_OGC_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s"
 #define	ENDFILE_ADS_SPEC "crtend.o%s ecrtn.o%s"
 +#define	ENDFILE_OGC_SPEC "crtend.o%s ecrtn.o%s"
 #define LINK_START_ADS_SPEC "-T ads.ld%s"
 +#define LINK_START_OGC_SPEC "-T ogc.ld%s"
 +#define LINK_START_RVL_SPEC "-T rvl.ld%s"
 +#define LINK_START_VGC_SPEC "-T vgcogc.ld%s"
 +#define LINK_START_GCB_SPEC "-T gcbogc.ld%s"
 #define LINK_OS_ADS_SPEC ""
 +#define LINK_OS_OGC_SPEC "--gc-sections"
 #define CPP_OS_ADS_SPEC ""
 +#define CPP_OS_GCN_SPEC "-D__gamecube__ -ffunction-sections -fdata-sections"
 +#define CPP_OS_OGC_SPEC "-D__gamecube__ -DHW_DOL -ffunction-sections -fdata-sections"
 +#define CPP_OS_RVL_SPEC "-D__wii__ -DHW_RVL -ffunction-sections -fdata-sections"
 /* Motorola Yellowknife support.  */
 #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
@@ -850,6 +874,7 @@ ncrtn.o%s"
 #undef	SUBTARGET_EXTRA_SPECS
 #define	SUBTARGET_EXTRA_SPECS						\
   { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
 +  { "lib_ogc",			LIB_OGC_SPEC },				\
   { "lib_ads",			LIB_ADS_SPEC },				\
   { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
   { "lib_mvme",			LIB_MVME_SPEC },			\
@@ -859,6 +884,7 @@ ncrtn.o%s"
   { "lib_netbsd",		LIB_NETBSD_SPEC },			\
   { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
   { "lib_default",		LIB_DEFAULT_SPEC },			\
 +  { "startfile_ogc",		STARTFILE_OGC_SPEC },			\
   { "startfile_ads",		STARTFILE_ADS_SPEC },			\
   { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
   { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
@@ -868,6 +894,7 @@ ncrtn.o%s"
   { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
   { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
   { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
 +  { "endfile_ogc",		ENDFILE_OGC_SPEC },			\
   { "endfile_ads",		ENDFILE_ADS_SPEC },			\
   { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
   { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
@@ -879,7 +906,11 @@ ncrtn.o%s"
   { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
   { "link_shlib",		LINK_SHLIB_SPEC },			\
   { "link_start",		LINK_START_SPEC },			\
 +  { "link_start_vgc",		LINK_START_VGC_SPEC },			\
 +  { "link_start_gcb",		LINK_START_GCB_SPEC },			\
 +  { "link_start_rvl",		LINK_START_RVL_SPEC },			\
   { "link_start_ads",		LINK_START_ADS_SPEC },			\
 +  { "link_start_ogc",		LINK_START_OGC_SPEC },			\
   { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
   { "link_start_mvme",		LINK_START_MVME_SPEC },			\
   { "link_start_sim",		LINK_START_SIM_SPEC },			\
@@ -889,6 +920,7 @@ ncrtn.o%s"
   { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
   { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
   { "link_os",			LINK_OS_SPEC },				\
 +  { "link_os_ogc",		LINK_OS_OGC_SPEC },			\
   { "link_os_ads",		LINK_OS_ADS_SPEC },			\
   { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
   { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
@@ -900,6 +932,9 @@ ncrtn.o%s"
   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
   { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
 +  { "cpp_os_gcn",		CPP_OS_GCN_SPEC },			\
 +  { "cpp_os_ogc",		CPP_OS_OGC_SPEC },			\
 +  { "cpp_os_rvl",		CPP_OS_RVL_SPEC },			\
   { "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
 index ac75d67b19a..bdee36872f8 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
@@ -124,6 +124,26 @@ mads
 Target RejectNegative
 Link with libads.a, libc.a and crt0.o.
 +mgcn
 +Target RejectNegative
 +Link with libsysbase.a and libc.a, use ogc linker script 
 +
 +mogc
 +Target RejectNegative
 +Link with libsysbase.a and libc.a, use ogc linker script 
 +
 +mgcbios
 +Target RejectNegative
 +Link with libsysbase.a and libc.a, use gcbogc linker script 
 +
 +mvgc
 +Target RejectNegative
 +Link with libsysbase.a and libc.a, use gcbogc linker script 
 +
 +mrvl
 +Target RejectNegative
 +Link with libsysbase.a and libc.a, use rvl linker script 
 +
 myellowknife
 Target RejectNegative
 Link with libyk.a, libc.a and crt0.o.
 diff --git a/gcc/configure b/gcc/configure
 index 5ce0557719a..a1c59e87b83 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -12884,7 +12884,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
 -  aix | dce | lynx | mipssde | posix | rtems | \
 +  aix | dce | dkp | lynx | mipssde | posix | rtems | \
   single | tpf | vxworks | win32)
     target_thread_file=${enable_threads}
     ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
 index 23bee7010a3..4540b6d3aee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -1994,7 +1994,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
 -  aix | dce | lynx | mipssde | posix | rtems | \
 +  aix | dce | dkp | lynx | mipssde | posix | rtems | \
   single | tpf | vxworks | win32)
     target_thread_file=${enable_threads}
     ;;
 diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
 index cf224657260..38683e58cb3 100644
 --- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
@@ -24,7 +24,7 @@
 /* On PowerPC64 Linux, these functions are provided by the linker.  */
 #ifndef __powerpc64__
 -
 +#if 0
 #undef __ALTIVEC__
 #define __ALTIVEC__ 1
 	#include "ppc-asm.h"
@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
 CFI_ENDPROC
 #endif
 +#endif
 diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
 index 65e791741f7..631be3ec5ba 100644
 --- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
@@ -24,7 +24,7 @@
 /* On PowerPC64 Linux, these functions are provided by the linker.  */
 #ifndef __powerpc64__
 -
 +#if 0
 #undef __ALTIVEC__
 #define __ALTIVEC__ 1
 	#include "ppc-asm.h"
@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
 CFI_ENDPROC
 #endif
 +#endif
 diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
 new file mode 100644
 index 00000000000..26180aa7f36
 --- /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.  */
 +/* Copyright (C) 1997-2016 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.
 +
 +Under Section 7 of GPL version 3, you are granted additional
 +permissions described in the GCC Runtime Library Exception, version
 +3.1, as published by the Free Software Foundation.
 +
 +You should have received a copy of the GNU General Public License and
 +a copy of the GCC Runtime Library Exception along with this program;
 +see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +<http://www.gnu.org/licenses/>.  */
 +
 +#define _BUILDING_LIBGCC
 +#include "gthr-dkp.h"
 +#include <stddef.h>
 +
 +
 +int
 +__gthread_active_p (void)
 +{
 +  if (!__has_gthr_impl(active)) {
 +    return 0;
 +  }
 +
 +  return __gthr_impl_active();
 +}
 +
 +int
 +__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
 +                  void *__args)
 +{
 +  if (!__has_gthr_impl(create)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_create(__threadid, __func, __args);
 +}
 +
 +int
 +__gthread_join (__gthread_t __threadid, void **__value_ptr)
 +{
 +  if (!__has_gthr_impl(join)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_join(__threadid, __value_ptr);
 +}
 +
 +int
 +__gthread_detach (__gthread_t __threadid)
 +{
 +  if (!__has_gthr_impl(detach)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_detach(__threadid);
 +}
 +
 +int
 +__gthread_equal (__gthread_t __t1, __gthread_t __t2)
 +{
 +  if (!__has_gthr_impl(equal)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_equal(__t1, __t2);
 +}
 +
 +__gthread_t
 +__gthread_self (void)
 +{
 +  if (!__has_gthr_impl(self)) {
 +    __gthread_t result = { 0 };
 +    return result;
 +  }
 +
 +  return __gthr_impl_self();
 +}
 +
 +int
 +__gthread_yield (void)
 +{
 +  if (!__has_gthr_impl(yield)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_yield();
 +}
 +
 +int
 +__gthread_once (__gthread_once_t *__once, void (*__func) (void))
 +{
 +  if (!__has_gthr_impl(once)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_once(__once, __func);
 +}
 +
 +int
 +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
 +{
 +  if (!__has_gthr_impl(key_create)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_key_create(__key, __dtor);
 +}
 +
 +int
 +__gthread_key_delete (__gthread_key_t __key)
 +{
 +  if (!__has_gthr_impl(key_delete)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_key_delete(__key);
 +}
 +
 +void *
 +__gthread_getspecific (__gthread_key_t __key)
 +{
 +  if (!__has_gthr_impl(getspecific)) {
 +    return NULL;
 +  }
 +
 +  return __gthr_impl_getspecific(__key);
 +}
 +
 +int
 +__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
 +{
 +  if (!__has_gthr_impl(setspecific)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_setspecific(__key, __ptr);
 +}
 +
 +void
 +__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
 +{
 +  if (__has_gthr_impl(mutex_init_function)) {
 +    __gthr_impl_mutex_init_function(__mutex);
 +  }
 +}
 +
 +int
 +__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(mutex_destroy)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_mutex_destroy(__mutex);
 +}
 +
 +int
 +__gthread_mutex_lock (__gthread_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(mutex_lock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_mutex_lock(__mutex);
 +}
 +
 +int
 +__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(mutex_trylock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_mutex_trylock(__mutex);
 +}
 +
 +int
 +__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(mutex_unlock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_mutex_unlock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(recursive_mutex_init_function)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_recursive_mutex_init_function(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(recursive_mutex_lock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_recursive_mutex_lock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(recursive_mutex_trylock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_recursive_mutex_trylock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(recursive_mutex_unlock)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_recursive_mutex_unlock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(recursive_mutex_destroy)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_recursive_mutex_destroy(__mutex);
 +}
 +
 +void
 +__gthread_cond_init_function (__gthread_cond_t *__cond)
 +{
 +  if (__has_gthr_impl(cond_init_function)) {
 +    __gthr_impl_cond_init_function(__cond);
 +  }
 +}
 +
 +int
 +__gthread_cond_broadcast (__gthread_cond_t *__cond)
 +{
 +  if (!__has_gthr_impl(cond_broadcast)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_broadcast(__cond);
 +}
 +
 +int
 +__gthread_cond_signal (__gthread_cond_t *__cond)
 +{
 +  if (!__has_gthr_impl(cond_signal)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_signal(__cond);
 +}
 +
 +int
 +__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(cond_wait)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_wait(__cond, __mutex);
 +}
 +
 +int
 +__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
 +                          const __gthread_time_t *__abs_timeout)
 +{
 +  if (!__has_gthr_impl(cond_timedwait)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
 +}
 +
 +int
 +__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
 +                               __gthread_recursive_mutex_t *__mutex)
 +{
 +  if (!__has_gthr_impl(cond_wait_recursive)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_wait_recursive(__cond, __mutex);
 +}
 +
 +int
 +__gthread_cond_destroy (__gthread_cond_t* __cond)
 +{
 +  if (!__has_gthr_impl(cond_destroy)) {
 +    return -1;
 +  }
 +
 +  return __gthr_impl_cond_destroy(__cond);
 +}
 diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
 new file mode 100644
 index 00000000000..72ecf82ab83
 --- /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.  */
 +/* Copyright (C) 1997-2016 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.
 +
 +Under Section 7 of GPL version 3, you are granted additional
 +permissions described in the GCC Runtime Library Exception, version
 +3.1, as published by the Free Software Foundation.
 +
 +You should have received a copy of the GNU General Public License and
 +a copy of the GCC Runtime Library Exception along with this program;
 +see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +<http://www.gnu.org/licenses/>.  */
 +
 +#ifndef _GLIBCXX_GCC_GTHR_DKP_H
 +#define _GLIBCXX_GCC_GTHR_DKP_H
 +
 +#define __GTHREADS 1
 +#define __GTHREADS_CXX0X 1
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +typedef void *                      __gthread_t;
 +typedef struct { int padding[7]; }  __gthread_cond_t;
 +typedef struct { int padding; }     __gthread_key_t;
 +typedef struct { int padding[11]; } __gthread_mutex_t;
 +typedef struct { int padding; }     __gthread_once_t;
 +typedef struct { int padding[11]; } __gthread_recursive_mutex_t;
 +typedef struct timespec             __gthread_time_t;
 +
 +#define __GTHREAD_HAS_COND 1
 +#define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
 +
 +#define __GTHREAD_ONCE_INIT { 0 }
 +#define __GTHREAD_TIME_INIT { 0, 0 }
 +
 +#define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function
 +#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
 +#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
 +
 +#ifdef _BUILDING_LIBGCC
 +#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
 +#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
 +#else
 +#define __GTHR_IMPL(_name) __gthr_impl_##_name
 +#endif
 +
 +int __GTHR_IMPL(active) (void);
 +int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
 +int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
 +int __GTHR_IMPL(detach) (__gthread_t __threadid);
 +int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
 +__gthread_t __GTHR_IMPL(self) (void);
 +int __GTHR_IMPL(yield) (void);
 +int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
 +int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
 +int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
 +void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
 +int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
 +void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
 +int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
 +int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
 +int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
 +int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
 +void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
 +int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
 +int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
 +int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
 +int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
 +                         const __gthread_time_t *__abs_timeout);
 +int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
 +                              __gthread_recursive_mutex_t *__mutex);
 +int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
 +
 +int
 +__gthread_active_p (void);
 +
 +int
 +__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
 +                  void *__args);
 +
 +int
 +__gthread_join (__gthread_t __threadid, void **__value_ptr);
 +
 +int
 +__gthread_detach (__gthread_t __threadid);
 +
 +int
 +__gthread_equal (__gthread_t __t1, __gthread_t __t2);
 +
 +__gthread_t
 +__gthread_self (void);
 +
 +int
 +__gthread_yield (void);
 +
 +int
 +__gthread_once (__gthread_once_t *__once, void (*__func) (void));
 +
 +int
 +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *));
 +
 +int
 +__gthread_key_delete (__gthread_key_t __key);
 +
 +void *
 +__gthread_getspecific (__gthread_key_t __key);
 +
 +int
 +__gthread_setspecific (__gthread_key_t __key, const void *__ptr);
 +
 +void
 +__gthread_mutex_init_function (__gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_mutex_destroy (__gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_mutex_lock (__gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_mutex_trylock (__gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_mutex_unlock (__gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex);
 +
 +int
 +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex);
 +
 +int
 +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex);
 +
 +int
 +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex);
 +
 +int
 +__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex);
 +
 +void
 +__gthread_cond_init_function (__gthread_cond_t *__cond);
 +
 +int
 +__gthread_cond_broadcast (__gthread_cond_t *__cond);
 +
 +int
 +__gthread_cond_signal (__gthread_cond_t *__cond);
 +
 +int
 +__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
 +
 +int
 +__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
 +                          const __gthread_time_t *__abs_timeout);
 +
 +int
 +__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
 +                               __gthread_recursive_mutex_t *__mutex);
 +
 +int
 +__gthread_cond_destroy (__gthread_cond_t* __cond);
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
 diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
 index fb812d3801f..7f6669d530f 100644
 --- a/libgcc/config/rs6000/t-ppccomm
 +++ 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
 index 1f9b2ac578b..539fd961156 100755
 --- a/libgcc/configure
 +++ b/libgcc/configure
@@ -5689,6 +5689,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 ;;
 +    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
     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
 index b98b86a5a88..3f62b3616d2 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
@@ -325,7 +325,7 @@ register_tm_clones (void)
 #ifdef OBJECT_FORMAT_ELF
 -#if DEFAULT_USE_CXA_ATEXIT
 +#if 1 /* DEFAULT_USE_CXA_ATEXIT */
 /* 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
 index eac60392121..d1c85de1e34 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
@@ -15765,6 +15765,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 ;;
 +    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
     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/std/fstream b/libstdc++-v3/include/std/fstream
 index e62a1ade3c2..5f8ec3a1495 100644
 --- a/libstdc++-v3/include/std/fstream
 +++ b/libstdc++-v3/include/std/fstream
@@ -46,7 +46,7 @@
 // This can be overridden by the target's os_defines.h
 #ifndef _GLIBCXX_BUFSIZ
 -# define _GLIBCXX_BUFSIZ BUFSIZ
 +# define _GLIBCXX_BUFSIZ (BUFSIZ+1)
 #endif
 namespace std _GLIBCXX_VISIBILITY(default)
 diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
 index c85b9aed40b..a8f3f4a50d2 100644
 --- a/libstdc++-v3/libsupc++/eh_alloc.cc
 +++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -85,6 +85,7 @@ namespace
     {
     public:
       pool();
 +      ~pool();
       _GLIBCXX_NODISCARD void *allocate (std::size_t);
       void free (void *);
@@ -136,6 +137,15 @@ namespace
       first_free_entry->next = NULL;
     }
 +  pool::~pool()
 +    {
 +      if (arena)
 +        {
 +          ::free(arena);
 +          arena = 0;
 +        }
 +    }
 +
   void *pool::allocate (std::size_t size)
     {
       __gnu_cxx::__scoped_lock sentry(emergency_mutex);
 diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
 index 435368fa5c5..75b78c384b4 100644
 --- a/libstdc++-v3/src/c++17/fs_ops.cc
 +++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -1123,6 +1123,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
     }
   int err = 0;
 +#ifndef __DEVKITPPC__
 #if _GLIBCXX_USE_FCHMODAT
   const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
   if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
@@ -1132,6 +1133,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
     ec = std::__unsupported();
   else if (posix::chmod(p.c_str(), static_cast<posix::mode_t>(prms)))
     err = errno;
 +#endif
 #endif
   if (err)
 diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
 index 978e8724154..f773d3b9b62 100644
 --- a/libstdc++-v3/src/filesystem/ops-common.h
 +++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -481,6 +481,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
 	return false;
       }
 +#ifndef __DEVKITPPC__
 #if defined _GLIBCXX_USE_FCHMOD && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
     if (::fchmod(out.fd, from_st->st_mode))
 #elif defined _GLIBCXX_USE_FCHMODAT && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
@@ -492,6 +493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
 	ec.assign(errno, std::generic_category());
 	return false;
       }
 +#endif
     size_t count = from_st->st_size;
 #if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
 diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
 index 896a4918ace..59a155b840e 100644
 --- a/libstdc++-v3/src/filesystem/ops.cc
 +++ b/libstdc++-v3/src/filesystem/ops.cc
@@ -971,6 +971,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
     }
   int err = 0;
 +#ifndef __DEVKITPPC__
 #if _GLIBCXX_USE_FCHMODAT
   const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
   if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
@@ -980,6 +981,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
     ec = std::__unsupported();
   else if (posix::chmod(p.c_str(), static_cast<mode_t>(prms)))
     err = errno;
 +#endif
 #endif
   if (err)
--- a/dkppc/patches/gcc-13.1.0.patch
+++ b/dkppc/patches/gcc-13.1.0.patch
@@ -1,7 +1,8 @@
-diff -NBaur gcc-12.1.0/config/gthr.m4 gcc-12.1.0-dkppc/config/gthr.m4
+diff --git a/config/gthr.m4 b/config/gthr.m4
--- gcc-12.1.0/config/gthr.m4	2022-05-06 08:30:56.000000000 +0100
+index 11996247f15..f21b315ce8a 100644
-+++ gcc-12.1.0-dkppc/config/gthr.m4	2022-05-06 19:17:44.784777075 +0100
+--- a/config/gthr.m4
-@@ -13,6 +13,7 @@
+++ b/config/gthr.m4
@@ -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 ;;
@@ -9,25 +10,11 @@ diff -NBaur gcc-12.1.0/config/gthr.m4 gcc-12.1.0-dkppc/config/gthr.m4
     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
     lynx)	thread_header=config/gthr-lynx.h ;;
     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff -NBaur gcc-12.1.0/gcc/config/i386/host-mingw32.cc gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc
+diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
--- gcc-12.1.0/gcc/config/i386/host-mingw32.cc	2022-05-06 08:30:56.000000000 +0100
+index 98bc77b46b8..4f1690d4f4d 100644
-+++ gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc	2022-05-06 19:17:44.784777075 +0100
+--- a/gcc/config/newlib-stdint.h
-@@ -45,7 +45,11 @@
+++ b/gcc/config/newlib-stdint.h
- static inline void w32_error(const char*, const char*, int, const char*);
+@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* FIXME: Is this big enough?  */
 +#if __MINGW64__
 +static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
 +#else
 static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
 +#endif
 /* Granularity for reserving address space.  */
 static size_t va_granularity = 0x10000;
 diff -NBaur gcc-12.1.0/gcc/config/newlib-stdint.h gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h
 --- gcc-12.1.0/gcc/config/newlib-stdint.h	2022-05-06 08:30:57.000000000 +0100
 +++ gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h	2022-05-06 19:17:44.784777075 +0100
@@ -25,7 +25,7 @@
 /* newlib uses 32-bit long in certain cases for all non-SPU
    targets.  */
 #ifndef STDINT_LONG32
@@ -36,10 +23,24 @@ diff -NBaur gcc-12.1.0/gcc/config/newlib-stdint.h gcc-12.1.0-dkppc/gcc/config/ne
 #endif
 #define SIG_ATOMIC_TYPE "int"
-diff -NBaur gcc-12.1.0/gcc/config/rs6000/rs6000.h gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h
+diff --git a/gcc/config/rs6000/eabi.h b/gcc/config/rs6000/eabi.h
--- gcc-12.1.0/gcc/config/rs6000/rs6000.h	2022-05-06 08:30:57.000000000 +0100
+index 5bfc377e0de..342ed1932b9 100644
-+++ gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h	2022-05-06 19:22:10.793624730 +0100
+--- a/gcc/config/rs6000/eabi.h
-@@ -196,6 +196,7 @@
+++ b/gcc/config/rs6000/eabi.h
@@ -36,6 +36,8 @@
       builtin_assert ("system=embedded"); \
       builtin_assert ("cpu=powerpc");     \
       builtin_assert ("machine=powerpc"); \
 +      builtin_define ("__DEVKITPPC__");   \
 +      builtin_define ("__DEVKITPRO__");   \
       TARGET_OS_SYSV_CPP_BUILTINS ();     \
     }                                     \
   while (0)
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
 index 3503614efbd..b0a1b8e4ad7 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
@@ -199,6 +199,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.cc.  */
@@ -47,7 +48,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/rs6000.h gcc-12.1.0-dkppc/gcc/config/rs
 #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
 /* In driver-rs6000.cc.  */
 extern const char *host_detect_local_cpu (int argc, const char **argv);
-@@ -207,6 +208,8 @@
+@@ -210,6 +211,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 #else
 #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
 #endif
@@ -56,10 +57,11 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/rs6000.h gcc-12.1.0-dkppc/gcc/config/rs
 #ifndef CC1_CPU_SPEC
 #ifdef HAVE_LOCAL_CPU_DETECT
-diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
--- gcc-12.1.0/gcc/config/rs6000/sysv4.h	2022-05-06 08:30:57.000000000 +0100
+index ae932fc22f0..527b48878b8 100644
-+++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h	2022-05-06 19:17:44.784777075 +0100
+--- a/gcc/config/rs6000/sysv4.h
-@@ -589,7 +589,11 @@
+++ b/gcc/config/rs6000/sysv4.h
@@ -581,7 +581,11 @@ GNU_USER_TARGET_CC1_SPEC
 /* Default starting address if specified.  */
 #define LINK_START_SPEC "\
@@ -72,7 +74,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(link_start_yellowknife) ; \
   mmvme        : %(link_start_mvme)        ; \
   msim         : %(link_start_sim)         ; \
-@@ -620,7 +624,8 @@
+@@ -612,7 +616,8 @@ GNU_USER_TARGET_CC1_SPEC
 /* Any specific OS flags.  */
 #define LINK_OS_SPEC "\
@@ -82,7 +84,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(link_os_yellowknife) ; \
   mmvme        : %(link_os_mvme)        ; \
   msim         : %(link_os_sim)         ; \
-@@ -635,7 +640,10 @@
+@@ -627,7 +632,10 @@ GNU_USER_TARGET_CC1_SPEC
 /* Override rs6000.h definition.  */
 #undef	CPP_SPEC
 #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -94,7 +96,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(cpp_os_yellowknife) ; \
   mmvme        : %(cpp_os_mvme)        ; \
   msim         : %(cpp_os_sim)         ; \
-@@ -649,7 +657,10 @@
+@@ -641,7 +649,10 @@ GNU_USER_TARGET_CC1_SPEC
 #undef	STARTFILE_SPEC
 #define	STARTFILE_SPEC "\
@@ -106,7 +108,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(startfile_yellowknife) ; \
   mmvme        : %(startfile_mvme)        ; \
   msim         : %(startfile_sim)         ; \
-@@ -663,7 +674,8 @@
+@@ -655,7 +666,8 @@ GNU_USER_TARGET_CC1_SPEC
 #undef	LIB_SPEC
 #define	LIB_SPEC "\
@@ -116,7 +118,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(lib_yellowknife) ; \
   mmvme        : %(lib_mvme)        ; \
   msim         : %(lib_sim)         ; \
-@@ -673,11 +685,12 @@
+@@ -665,11 +677,12 @@ GNU_USER_TARGET_CC1_SPEC
   mcall-openbsd: %(lib_openbsd)     ; \
                : %(lib_default)     }"
@@ -131,7 +133,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   myellowknife : %(endfile_yellowknife) ; \
   mmvme        : %(endfile_mvme)        ; \
   msim         : %(endfile_sim)         ; \
-@@ -693,16 +706,27 @@
+@@ -685,16 +698,27 @@ GNU_USER_TARGET_CC1_SPEC
 /* Motorola ADS support.  */
 #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -159,7 +161,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
 /* Motorola Yellowknife support.  */
 #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -850,6 +874,7 @@
+@@ -842,6 +866,7 @@ ncrtn.o%s"
 #undef	SUBTARGET_EXTRA_SPECS
 #define	SUBTARGET_EXTRA_SPECS						\
   { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -167,7 +169,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "lib_ads",			LIB_ADS_SPEC },				\
   { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
   { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -859,6 +884,7 @@
+@@ -851,6 +876,7 @@ ncrtn.o%s"
   { "lib_netbsd",		LIB_NETBSD_SPEC },			\
   { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
   { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -175,7 +177,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "startfile_ads",		STARTFILE_ADS_SPEC },			\
   { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
   { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -868,6 +894,7 @@
+@@ -860,6 +886,7 @@ ncrtn.o%s"
   { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
   { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
   { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -183,7 +185,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "endfile_ads",		ENDFILE_ADS_SPEC },			\
   { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
   { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -879,7 +906,11 @@
+@@ -871,7 +898,11 @@ ncrtn.o%s"
   { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
   { "link_shlib",		LINK_SHLIB_SPEC },			\
   { "link_start",		LINK_START_SPEC },			\
@@ -195,7 +197,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
   { "link_start_mvme",		LINK_START_MVME_SPEC },			\
   { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -889,6 +920,7 @@
+@@ -881,6 +912,7 @@ ncrtn.o%s"
   { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
   { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
   { "link_os",			LINK_OS_SPEC },				\
@@ -203,7 +205,7 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "link_os_ads",		LINK_OS_ADS_SPEC },			\
   { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
   { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -900,6 +932,9 @@
+@@ -892,6 +924,9 @@ ncrtn.o%s"
   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
   { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
@@ -213,10 +215,11 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6
   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.opt gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt
+diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
--- gcc-12.1.0/gcc/config/rs6000/sysv4.opt	2022-05-06 08:30:57.000000000 +0100
+index 691e0d3d2e8..2eb60bc56b6 100644
-+++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt	2022-05-06 19:17:44.784777075 +0100
+--- a/gcc/config/rs6000/sysv4.opt
-@@ -124,6 +124,26 @@
+++ b/gcc/config/rs6000/sysv4.opt
@@ -124,6 +124,26 @@ mads
 Target RejectNegative
 Link with libads.a, libc.a and crt0.o.
@@ -243,33 +246,36 @@ diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.opt gcc-12.1.0-dkppc/gcc/config/r
 myellowknife
 Target RejectNegative
 Link with libyk.a, libc.a and crt0.o.
-diff -NBaur gcc-12.1.0/gcc/configure gcc-12.1.0-dkppc/gcc/configure
+diff --git a/gcc/configure b/gcc/configure
--- gcc-12.1.0/gcc/configure	2022-05-06 08:30:57.000000000 +0100
+index c7b26d1927d..d1e32ef9ec5 100755
-+++ gcc-12.1.0-dkppc/gcc/configure	2022-05-06 19:17:44.788859483 +0100
+--- a/gcc/configure
-@@ -12884,7 +12884,7 @@
+++ b/gcc/configure
@@ -13011,7 +13011,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
 -  aix | dce | lynx | mipssde | posix | rtems | \
 +  aix | dce | dkp | lynx | mipssde | posix | rtems | \
-   single | tpf | vxworks | win32)
+   single | tpf | vxworks | win32 | mcf)
     target_thread_file=${enable_threads}
     ;;
-diff -NBaur gcc-12.1.0/gcc/configure.ac gcc-12.1.0-dkppc/gcc/configure.ac
+diff --git a/gcc/configure.ac b/gcc/configure.ac
--- gcc-12.1.0/gcc/configure.ac	2022-05-06 08:30:57.000000000 +0100
+index 09082e8ccae..f5700df9455 100644
-+++ gcc-12.1.0-dkppc/gcc/configure.ac	2022-05-06 19:17:44.788859483 +0100
+--- a/gcc/configure.ac
-@@ -1994,7 +1994,7 @@
+++ b/gcc/configure.ac
@@ -2020,7 +2020,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
 -  aix | dce | lynx | mipssde | posix | rtems | \
 +  aix | dce | dkp | lynx | mipssde | posix | rtems | \
-   single | tpf | vxworks | win32)
+   single | tpf | vxworks | win32 | mcf)
     target_thread_file=${enable_threads}
     ;;
-diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S
+diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
--- gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S	2022-05-06 08:30:59.000000000 +0100
+index cf7f71ae123..7e0892a845f 100644
-+++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S	2022-05-06 19:17:44.792941894 +0100
+--- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
@@ -24,7 +24,7 @@
 /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -279,14 +285,15 @@ diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S gcc-12.1.0-dkppc/libgcc/
 #undef __ALTIVEC__
 #define __ALTIVEC__ 1
 	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@
+@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
 CFI_ENDPROC
 #endif
 +#endif
-diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S
+diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
--- gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S	2022-05-06 08:30:59.000000000 +0100
+index 19de2128714..d116593062d 100644
-+++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S	2022-05-06 19:17:44.792941894 +0100
+--- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
@@ -24,7 +24,7 @@
 /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -296,14 +303,16 @@ diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S gcc-12.1.0-dkppc/libgcc/
 #undef __ALTIVEC__
 #define __ALTIVEC__ 1
 	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@
+@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
 CFI_ENDPROC
 #endif
 +#endif
-diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c
+diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c	1970-01-01 01:00:00.000000000 +0100
+new file mode 100644
-+++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c	2022-05-06 19:17:44.792941894 +0100
+index 00000000000..26180aa7f36
 --- /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.  */
@@ -624,9 +633,11 @@ diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c gcc-12.1.0-dkppc/libgcc/c
 +
 +  return __gthr_impl_cond_destroy(__cond);
 +}
-diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h
+diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h	1970-01-01 01:00:00.000000000 +0100
+new file mode 100644
-+++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h	2022-05-06 19:17:44.792941894 +0100
+index 00000000000..72ecf82ab83
 --- /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.  */
@@ -815,19 +826,21 @@ diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h gcc-12.1.0-dkppc/libgcc/c
 +#endif
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
-diff -NBaur gcc-12.1.0/libgcc/config/rs6000/t-ppccomm gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm
+diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
--- gcc-12.1.0/libgcc/config/rs6000/t-ppccomm	2022-05-06 08:30:59.000000000 +0100
+index fb812d3801f..7f6669d530f 100644
-+++ gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm	2022-05-06 19:17:44.792941894 +0100
+--- a/libgcc/config/rs6000/t-ppccomm
 +++ 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 -NBaur gcc-12.1.0/libgcc/configure gcc-12.1.0-dkppc/libgcc/configure
+diff --git a/libgcc/configure b/libgcc/configure
--- gcc-12.1.0/libgcc/configure	2022-05-06 08:30:59.000000000 +0100
+index be5d45f1755..5c5aa253655 100755
-+++ gcc-12.1.0-dkppc/libgcc/configure	2022-05-06 19:17:44.792941894 +0100
+--- a/libgcc/configure
-@@ -5689,6 +5689,7 @@
+++ b/libgcc/configure
@@ -5690,6 +5690,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 ;;
@@ -835,10 +848,11 @@ diff -NBaur gcc-12.1.0/libgcc/configure gcc-12.1.0-dkppc/libgcc/configure
     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
     lynx)	thread_header=config/gthr-lynx.h ;;
     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff -NBaur gcc-12.1.0/libgcc/crtstuff.c gcc-12.1.0-dkppc/libgcc/crtstuff.c
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
--- gcc-12.1.0/libgcc/crtstuff.c	2022-05-06 08:30:59.000000000 +0100
+index 93ff5b81dc5..20c0fe89a28 100644
-+++ gcc-12.1.0-dkppc/libgcc/crtstuff.c	2022-05-06 19:17:44.792941894 +0100
+--- a/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@
+++ b/libgcc/crtstuff.c
@@ -326,7 +326,7 @@ register_tm_clones (void)
 #ifdef OBJECT_FORMAT_ELF
@@ -847,10 +861,11 @@ diff -NBaur gcc-12.1.0/libgcc/crtstuff.c gcc-12.1.0-dkppc/libgcc/crtstuff.c
 /* 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 -NBaur gcc-12.1.0/libstdc++-v3/configure gcc-12.1.0-dkppc/libstdc++-v3/configure
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
--- gcc-12.1.0/libstdc++-v3/configure	2022-05-06 08:31:00.000000000 +0100
+index 68ee94c9e28..1e17f789b89 100755
-+++ gcc-12.1.0-dkppc/libstdc++-v3/configure	2022-05-06 19:17:44.801106712 +0100
+--- a/libstdc++-v3/configure
-@@ -15765,6 +15765,7 @@
+++ b/libstdc++-v3/configure
@@ -15800,6 +15800,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 ;;
@@ -858,3 +873,104 @@ diff -NBaur gcc-12.1.0/libstdc++-v3/configure gcc-12.1.0-dkppc/libstdc++-v3/conf
     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/std/fstream b/libstdc++-v3/include/std/fstream
 index 3dff4e5e74e..7835a727321 100644
 --- a/libstdc++-v3/include/std/fstream
 +++ b/libstdc++-v3/include/std/fstream
@@ -48,7 +48,7 @@
 // This can be overridden by the target's os_defines.h
 #ifndef _GLIBCXX_BUFSIZ
 -# define _GLIBCXX_BUFSIZ BUFSIZ
 +# define _GLIBCXX_BUFSIZ (BUFSIZ+1)
 #endif
 namespace std _GLIBCXX_VISIBILITY(default)
 diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
 index 8380052c9f3..100de070f20 100644
 --- a/libstdc++-v3/libsupc++/eh_alloc.cc
 +++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -143,6 +143,7 @@ namespace
     {
     public:
       pool() noexcept;
 +      ~pool();
       _GLIBCXX_NODISCARD void *allocate (std::size_t) noexcept;
       void free (void *) noexcept;
@@ -248,6 +249,15 @@ namespace
       first_free_entry->next = NULL;
     }
 +  pool::~pool()
 +    {
 +      if (arena)
 +        {
 +          ::free(arena);
 +          arena = 0;
 +        }
 +    }
 +
   void *pool::allocate (std::size_t size) noexcept
     {
       __scoped_lock sentry(emergency_mutex);
 diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
 index c94d260632f..74c7a06a90d 100644
 --- a/libstdc++-v3/src/c++17/fs_ops.cc
 +++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -1124,6 +1124,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
     }
   int err = 0;
 +#ifndef __DEVKITPPC__
 #if _GLIBCXX_USE_FCHMODAT
   const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
   if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
@@ -1133,6 +1134,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
     ec = std::__unsupported();
   else if (posix::chmod(p.c_str(), static_cast<posix::mode_t>(prms)))
     err = errno;
 +#endif
 #endif
   if (err)
 diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
 index c95511b5c95..f9be4529bb2 100644
 --- a/libstdc++-v3/src/filesystem/ops-common.h
 +++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -486,6 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
 	return false;
       }
 +#ifndef __DEVKITPPC__
 #if defined _GLIBCXX_USE_FCHMOD && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
     if (::fchmod(out.fd, from_st->st_mode))
 #elif defined _GLIBCXX_USE_FCHMODAT && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
@@ -497,6 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
 	ec.assign(errno, std::generic_category());
 	return false;
       }
 +#endif
     size_t count = from_st->st_size;
 #if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
 diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
 index d33c13d7f15..7c343cdc30e 100644
 --- a/libstdc++-v3/src/filesystem/ops.cc
 +++ b/libstdc++-v3/src/filesystem/ops.cc
@@ -972,6 +972,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
     }
   int err = 0;
 +#ifndef __DEVKITPPC__
 #if _GLIBCXX_USE_FCHMODAT
   const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
   if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
@@ -981,6 +982,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
     ec = std::__unsupported();
   else if (posix::chmod(p.c_str(), static_cast<mode_t>(prms)))
     err = errno;
 +#endif
 #endif
   if (err)
--- a/dkppc/patches/newlib-4.2.0.20211231.patch
+++ b/dkppc/patches/newlib-4.2.0.20211231.patch
--- a/dkppc/patches/newlib-4.3.0.20230120.patch
+++ b/dkppc/patches/newlib-4.3.0.20230120.patch
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -76,6 +76,8 @@ cd $BUILDDIR
 mkdir -p $target/gcc
 cd $target/gcc
 export gcc_cv_libc_provides_ssp=yes
 if [ ! -f configured-gcc ]
 then
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
@@ -93,12 +95,13 @@ then
 	--enable-libstdcxx-filesystem-ts \
 	--disable-tm-clone-registry \
 	--disable-__cxa_atexit \
 	--disable-libssp \
 	--enable-cxx-flags='-ffunction-sections -fdata-sections' \
 	--target=$target \
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 41" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 43" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
 	$EXTRA_GCC_PARAMS \
@@ -136,7 +139,7 @@ unset CXX
 if [ ! -f configured-newlib ]
 then
-	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
+	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections -DCUSTOM_MALLOC_LOCK" \
 	../../newlib-$NEWLIB_VER/configure \
 	--target=$target \
 	--prefix=$prefix \
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -30,28 +30,28 @@ done
 case "$VERSION" in
  "1" )
-    GCC_VER=12.2.0
+    GCC_VER=13.1.0
-    BINUTILS_VER=2.39
+    BINUTILS_VER=2.40
-    NEWLIB_VER=4.2.0.20211231
+    NEWLIB_VER=4.3.0.20230120
    basedir='dkarm-eabi'
    package=devkitARM
    target=arm-none-eabi
    toolchain=DEVKITARM
  ;;
  "2" )
-    GCC_VER=12.1.0
+    GCC_VER=13.1.0
-    BINUTILS_VER=2.37
+    BINUTILS_VER=2.40
    MN_BINUTILS_VER=2.24
-    NEWLIB_VER=4.2.0.20211231
+    NEWLIB_VER=4.3.0.20230120
    basedir='dkppc'
    package=devkitPPC
    target=powerpc-eabi
    toolchain=DEVKITPPC
  ;;
  "3" )
-    GCC_VER=12.1.0
+    GCC_VER=12.2.0
    BINUTILS_VER=2.32
-    NEWLIB_VER=4.2.0.20211231
+    NEWLIB_VER=4.3.0.20230120
    basedir='dka64'
    package=devkitA64
    target=aarch64-none-elf
Author	SHA1	Message	Date
Dave Murphy	4319248cf8	devkitARM: fix dynamic reent	2023-05-01 16:24:23 +01:00
Dave Murphy	80a329157a	prevent hard dependency on findfp	2023-05-01 16:21:39 +01:00
Dave Murphy	c8273a1082	devkitARM: newlib add symlink support	2023-05-01 16:21:38 +01:00
Dave Murphy	4defc0f22b	devkitARM: update gcc to 13.1.0	2023-05-01 16:21:38 +01:00
Dave Murphy	d158002ce3	devkitARM: test 13.1.0 RC2	2023-05-01 16:21:33 +01:00
Dave Murphy	62b6ba1484	devkitPPC: enable dynamic reent	2023-05-01 12:08:04 +01:00
Dave Murphy	e3dca6f33f	devkitPPC: move to gcc 13.1.0	2023-05-01 12:08:04 +01:00
Dave Murphy	db4e394ab8	update devkitppc-rules version	2023-04-29 11:39:06 +01:00
Dave Murphy	8f6a2cf470	update devkitarm rules/crtls versions	2023-04-29 10:45:59 +01:00
Dave Murphy	3429d8162f	bump devkitPPC version	2023-04-20 07:42:20 +01:00
Dave Murphy	a048d2e89c	devkitPPC: newlib fixes	2023-04-20 07:40:43 +01:00
Dave Murphy	94cabdf12a	devkitPPC: update version	2023-04-19 09:15:33 +01:00
Dave Murphy	6a2cfec336	devkitPPC: disable gcc libssp	2023-04-19 08:59:50 +01:00
Dave Murphy	7b03d726b6	devkitPPC: update newlib to 4.3.0	2023-04-15 14:49:13 +01:00
Dave Murphy	9df0987259	devkitPPC: update binutils to 2.40	2023-04-15 14:48:22 +01:00
Dave Murphy	923724a397	devkitPPC: update gcc to 12.2.0	2023-04-15 14:48:22 +01:00
Dave Murphy	cd5e224d6a	devkitARM: update newlib to 4.3.0	2023-04-03 21:54:26 +01:00
Dave Murphy	b280c0af31	devkitARM: update gcc patch	2023-04-03 21:53:28 +01:00
Dave Murphy	776be5894d	devkitARM: next update is release 60	2023-04-03 21:53:28 +01:00
Dave Murphy	87f8584b86	devkitA64: use binutils 2.40	2023-04-03 21:53:28 +01:00
Dave Murphy	84ca4f5c18	devkitA64: remove old gcc patch	2023-04-02 19:42:31 +01:00
Dave Murphy	a07a271bdb	devkitA64: add __DEVKITPRO__ to built-in defines	2023-04-02 19:42:30 +01:00
Dave Murphy	026a498a51	devkitA64: update newlib to 4.3.0	2023-04-02 19:42:30 +01:00
omerien	b5de354a1e	Use https urls (#56 )	2022-11-20 15:39:15 +00:00
Dave Murphy	ca6cded363	devkitA64: update gcc to 12.2.0	2022-11-13 11:23:23 +00:00