diff --git a/build-devkit.sh b/build-devkit.sh
index d044608..5869dbb 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#---------------------------------------------------------------------------------
-# devkitARM release 60
+# devkitARM release 61
# devkitPPC release 43
# devkitA64 release 21
#---------------------------------------------------------------------------------
diff --git a/dkarm-eabi/patches/gcc-13.1.0-RC2-20230419.patch b/dkarm-eabi/patches/gcc-13.1.0-RC2-20230419.patch
new file mode 100644
index 0000000..18e2630
--- /dev/null
+++ 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
+ # .
+
+-# 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
++ . */
++
++#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
++; .
++
++; 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 ,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 ,g' \
+ < $< > $@
+
diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh
index a9fc6a0..b948f01 100755
--- 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 60" \
+ --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 61" \
$CROSS_PARAMS \
$CROSS_GCC_PARAMS \
$EXTRA_GCC_PARAMS \
diff --git a/select_toolchain.sh b/select_toolchain.sh
index fb5fa52..117a3b2 100755
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -30,7 +30,7 @@ done
case "$VERSION" in
"1" )
- GCC_VER=12.2.0
+ GCC_VER=13.1.0-RC2-20230419
BINUTILS_VER=2.40
NEWLIB_VER=4.3.0.20230120
basedir='dkarm-eabi'