devkitARM: fix dynamic reent

build-devkit.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 60
-#	devkitPPC release 41
+#	devkitARM release 61
+#	devkitPPC release 43
 #	devkitA64 release 21
 #---------------------------------------------------------------------------------
 
@@ -27,10 +27,10 @@ echo
 
 
 
-DKARM_RULES_VER=1.2.1
-DKARM_CRTLS_VER=1.1.1
+DKARM_RULES_VER=1.3.0
+DKARM_CRTLS_VER=1.2.1
 
-DKPPC_RULES_VER=1.1.0
+DKPPC_RULES_VER=1.1.2
 
 DKA64_RULES_VER=1.0.1
 

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' \
+ 	    < $< > $@
+ 

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' \
+ 	    < $< > $@
+ 

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 60" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 61" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
                 $EXTRA_GCC_PARAMS \

dkppc/patches/gcc-13.1.0.patch

@@ -0,0 +1,976 @@
+diff --git a/config/gthr.m4 b/config/gthr.m4
+index 11996247f15..f21b315ce8a 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/newlib-stdint.h b/gcc/config/newlib-stdint.h
+index 98bc77b46b8..4f1690d4f4d 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 5bfc377e0de..342ed1932b9 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 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.  */
++#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 ae932fc22f0..527b48878b8 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -581,7 +581,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)         ; \
+@@ -612,7 +616,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)         ; \
+@@ -627,7 +632,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)         ; \
+@@ -641,7 +649,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)         ; \
+@@ -655,7 +666,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)         ; \
+@@ -665,11 +677,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)         ; \
+@@ -685,16 +698,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"
+@@ -842,6 +866,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 },			\
+@@ -851,6 +876,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 },			\
+@@ -860,6 +886,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 },			\
+@@ -871,7 +898,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 },			\
+@@ -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 },				\
++  { "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 },			\
+@@ -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 },			\
++  { "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 691e0d3d2e8..2eb60bc56b6 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 c7b26d1927d..d1e32ef9ec5 100755
+--- a/gcc/configure
++++ 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 | mcf)
+     target_thread_file=${enable_threads}
+     ;;
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 09082e8ccae..f5700df9455 100644
+--- a/gcc/configure.ac
++++ 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 | mcf)
+     target_thread_file=${enable_threads}
+     ;;
+diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
+index cf7f71ae123..7e0892a845f 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 19de2128714..d116593062d 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 be5d45f1755..5c5aa253655 100755
+--- a/libgcc/configure
++++ 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 ;;
++    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 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/libstdc++-v3/configure b/libstdc++-v3/configure
+index 68ee94c9e28..1e17f789b89 100755
+--- a/libstdc++-v3/configure
++++ 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 ;;
++    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 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)

dkppc/patches/newlib-4.3.0.20230120.patch

@@ -9123,7 +9123,7 @@ index bc967bd70..b0d8d64f0 100644
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/powerpc/libc_a-vfprintf.o -MD -MP -MF libc/machine/powerpc/$(DEPDIR)/libc_a-vfprintf.Tpo -c -o libc/machine/powerpc/libc_a-vfprintf.o `test -f 'libc/machine/powerpc/vfprintf.c' || echo '$(srcdir)/'`libc/machine/powerpc/vfprintf.c
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/powerpc/$(DEPDIR)/libc_a-vfprintf.Tpo libc/machine/powerpc/$(DEPDIR)/libc_a-vfprintf.Po
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 0a1ba282a..749f1ec7d 100644
+index 0a1ba282a..25722d004 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
 @@ -627,6 +627,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
@@ -9146,10 +9146,10 @@ index 0a1ba282a..749f1ec7d 100644
  	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
  	;;
 -  powerpc*-*-eabi* | \
-+	powerpc*-*-eabi*)
++  powerpc*-*-eabi*)
 +	default_newlib_io_c99_formats="yes"
 +	default_newlib_io_long_long="yes"
-+	newlib_cflags="${newlib_cflags} -DCUSTOM_MALLOC_LOCK -DREENTRANT_SYSCALLS_PROVIDED -D__DEFAULT_UTF8__"
++	newlib_cflags="${newlib_cflags} -DCUSTOM_MALLOC_LOCK -D__DYNAMIC_REENT__ -DGETREENT_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -D__DEFAULT_UTF8__"
 +	newlib_cflags="${newlib_cflags} -ffunction-sections -fdata-sections"
 +	syscall_dir=syscalls
 +	;;
@@ -9207,21 +9207,30 @@ index 23d572cd3..65310c084 100644
  extern int _stat_r (struct _reent *, const char *, struct stat *);
  extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
-index 5dcc77a80..3a33705c0 100644
+index 5dcc77a80..6930a751d 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
-@@ -8,6 +8,11 @@
- #define MALLOC_ALIGNMENT 16
- #endif
+@@ -4,8 +4,19 @@
+ #include <machine/ieeefp.h>  /* floating point macros */
+ #include <sys/features.h>	/* POSIX defs */
  
-+#ifdef _ARCH_PPC
-+#define __BUFSIZ__ 32768
-+#define MALLOC_ALIGNMENT 64
+-#ifdef __aarch64__
++#ifdef __DEVKITARM__
++#define __DYNAMIC_REENT__
 +#endif
 +
- #ifdef __AMDGCN__
- #define __DYNAMIC_REENT__
++#ifdef __DEVKITA64__
+ #define MALLOC_ALIGNMENT 16
++#define __DYNAMIC_REENT__
++#endif
++
++#ifdef __DEVKITPPC__
++#define __BUFSIZ__ 32768
++#define MALLOC_ALIGNMENT 64
++#define __DYNAMIC_REENT__
  #endif
+ 
+ #ifdef __AMDGCN__
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
 index 45476ce4a..d76706321 100644
 --- a/newlib/libc/include/sys/features.h

dkppc/scripts/build-gcc.sh

@@ -101,7 +101,7 @@ then
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 42.2" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 43" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
 	$EXTRA_GCC_PARAMS \

select_toolchain.sh

@@ -30,7 +30,7 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=12.2.0
+    GCC_VER=13.1.0
     BINUTILS_VER=2.40
     NEWLIB_VER=4.3.0.20230120
     basedir='dkarm-eabi'
@@ -39,7 +39,7 @@ case "$VERSION" in
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=12.2.0
+    GCC_VER=13.1.0
     BINUTILS_VER=2.40
     MN_BINUTILS_VER=2.24
     NEWLIB_VER=4.3.0.20230120