devkitPPC: update newlib to 4.3.0

.gitignore

@@ -2,6 +2,7 @@ config.sh
 .devkitARM*
 .devkitPPC*
 .devkitA64*
+*.xz
 *.gz
 *.bz2
 *~

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/
-http://www.mpfr.org/
-http://www.multiprecision.org/
+https://gmplib.org/
+https://www.mpfr.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/
-http://www.zlib.net
-http://www.libusb.org
-http://expat.sourceforge.net/
+https://freeimage.sourceforge.net/
+https://www.zlib.net
+https://www.libusb.org
+https://expat.sourceforge.net/
 
 sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
 

build-devkit.sh

@@ -1,9 +1,8 @@
-
-#!/bin/bash
+#!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 54
-#	devkitPPC release 37
-#	devkitA64 release 15
+#	devkitARM release 60
+#	devkitPPC release 41
+#	devkitA64 release 21
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -28,10 +27,12 @@ echo
 
 
 
-DKARM_RULES_VER=1.0.0
-DKARM_CRTLS_VER=1.0.0
+DKARM_RULES_VER=1.2.1
+DKARM_CRTLS_VER=1.1.1
 
-DKPPC_RULES_VER=1.0.0
+DKPPC_RULES_VER=1.1.0
+
+DKA64_RULES_VER=1.0.1
 
 OSXMIN=${OSXMIN:-10.9}
 
@@ -57,13 +58,6 @@ if [ ! -z "$CROSSBUILD" ] ; then
 	fi
 fi
 
-#---------------------------------------------------------------------------------
-# Sane defaults for building toolchain
-#---------------------------------------------------------------------------------
-export CFLAGS="-O2 -pipe"
-export CXXFLAGS="$CFLAGS"
-unset LDFLAGS
-
 #---------------------------------------------------------------------------------
 # Look for automated configuration file to bypass prompts
 #---------------------------------------------------------------------------------
@@ -118,24 +112,22 @@ fi
 echo use $MAKE as make
 export MAKE
 
+CROSS_PARAMS="--build=`./config.guess`"
+
+if [ ! -z $CROSSBUILD ]; then
+	export PATH=/opt/devkitpro/$package/bin:$PATH
+	prefix=$INSTALLDIR/$CROSSBUILD/$package
+	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
+	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH --with-isl=$CROSSPATH --with-zstd=$CROSSPATH"
+else
+	prefix=$INSTALLDIR/$package
+fi
+
 #---------------------------------------------------------------------------------
 # Add installed devkit to the path, adjusting path on minsys
 #---------------------------------------------------------------------------------
 TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
-export PATH=$PATH:$TOOLPATH/$package/bin
-
-CROSS_PARAMS="--build=`./config.guess`"
-
-if [ ! -z $CROSSBUILD ]; then
-	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
-	prefix=$INSTALLDIR/$CROSSBUILD/$package
-	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
-	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
-	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
-else
-	toolsprefix=$INSTALLDIR/tools
-	prefix=$INSTALLDIR/$package
-fi
+export PATH=$TOOLPATH/$package/bin:$PATH
 
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
 
@@ -162,7 +154,7 @@ case $PLATFORM in
 		fi
     ;;
 	MINGW32* )
-		cppflags="-D__USE_MINGW_ACCESS"
+		cppflags="-D__USE_MINGW_ACCESS -D__USE_MINGW_ANSI_STDIO=1"
     ;;
 esac
 
@@ -181,19 +173,25 @@ fi
 patchdir=$(pwd)/$basedir/patches
 scriptdir=$(pwd)/$basedir/scripts
 
-archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
+archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz"
 
+if [ $VERSION -eq 2 ]; then
+	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
+fi
+
+if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
 	if [ $VERSION -eq 1 ]; then
-
-	archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
+		archives="devkitarm-rules-$DKARM_RULES_VER.tar.gz devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz $archives"
 	fi
 
 	if [ $VERSION -eq 2 ]; then
-
-	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
+		archives="devkitppc-rules-$DKPPC_RULES_VER.tar.gz $archives"
 	fi
 
-
+	if [ $VERSION -eq 3 ]; then
+		archives="devkita64-rules-$DKA64_RULES_VER.tar.gz $archives"
+	fi
+fi
 
 if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
 	SRCDIR="$BUILD_DKPRO_SRCDIR"
@@ -217,7 +215,6 @@ cd $BUILDDIR
 extract_and_patch binutils $BINUTILS_VER xz
 extract_and_patch gcc $GCC_VER xz
 extract_and_patch newlib $NEWLIB_VER gz
-extract_and_patch gdb $GDB_VER xz
 
 if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
 
@@ -233,13 +230,10 @@ fi
 
 cd $BUILDSCRIPTDIR
 
-if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
-	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/bin/
-	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/libexec/gcc/$target/$GCC_VER/
-fi
-
+if [ "$BUILD_DKPRO_NO_STRIP_BINARIES" != "1" ]; then
 	echo "stripping installed binaries"
 	. ./strip_bins.sh
+fi
 
 #---------------------------------------------------------------------------------
 # Clean up temporary files and source directories

cross-build-i686-w64-mingw32.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-export CROSSBUILD=i686-w64-mingw32
-export CROSSPATH=/opt/mingw32/mingw
-export CROSSLIBPATH=$CROSSPATH/lib
-export CROSSBINPATH=$CROSSPATH/bin
-export PATH=/opt/mingw32/bin:$PATH
-

cross-build-x86_64-apple-darwin15.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export CPPFLAGS=-I/opt/osx/x86_64-apple-darwin15/include
-export LDFLAGS=-L/opt/osx/x86_64-apple-darwin15/lib
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-
-export CC=x86_64-apple-darwin15-clang
-export CXX=x86_64-apple-darwin15-clang++
-
-export CROSSBUILD=x86_64-apple-darwin15
-export CROSSPATH=/opt/osx/x86_64-apple-darwin15
-export CROSSLIBPATH=$CROSSPATH/lib
-export CROSSBINPATH=$CROSSPATH/bin
-export PATH=/opt/osx/bin:$PATH
-export PKG_CONFIG_PATH=
-export PKG_CONFIG_LIBDIR=$CROSSLIBPATH/pkgconfig
-

cross-build-x86_64-w64-mingw32.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-export CROSSBUILD=x86_64-w64-mingw32
-export CROSSPATH=/opt/mingw64/mingw
-export CROSSLIBPATH=$CROSSPATH/lib
-export CROSSBINPATH=$CROSSPATH/bin
-export PATH=/opt/mingw64/bin:$PATH
-

dka64/patches/gcc-12.2.0.patch

@@ -1,8 +1,8 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index cf1a87e2efd..bd79664568e 100644
+index c5064dd3766..decfa78fb7b 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -1039,7 +1039,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -1093,7 +1093,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
  	tmake_file="${tmake_file} aarch64/t-aarch64"
  	case $target in
  	aarch64-*-elf*)
@@ -18,7 +18,7 @@ index cf1a87e2efd..bd79664568e 100644
          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 da5872cf4d8..ca840ab29cb 100644
+index d4d820a9d54..ed5dd440846 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
 @@ -22,6 +22,7 @@
@@ -30,7 +30,7 @@ index da5872cf4d8..ca840ab29cb 100644
  #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 ee7bed34924..d1e2742d750 100644
+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 {
@@ -46,11 +46,11 @@ index ee7bed34924..d1e2742d750 100644
  /* The code model defines the address generation strategy.
     Most have a PIC and non-PIC variant.  */
  enum aarch64_code_model {
-diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
-index 409ca8d9519..fa57bbf8cd5 100644
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -15951,8 +15951,24 @@ aarch64_load_tp (rtx target)
+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);
  
@@ -78,10 +78,10 @@ index 409ca8d9519..fa57bbf8cd5 100644
  }
  
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index 24767c747ba..0b1bbb5d79e 100644
+index 359b6e8561f..f5b596fc312 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -1134,6 +1134,10 @@ typedef struct
+@@ -1245,6 +1245,10 @@ typedef struct
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -92,11 +92,20 @@ index 24767c747ba..0b1bbb5d79e 100644
  extern enum aarch64_code_model aarch64_cmodel;
  
  /* When using the tiny addressing model conditional and unconditional branches
+@@ -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 },
+ 
+-#if defined(__aarch64__)
++#if 0 // defined(__aarch64__)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ #define HAVE_LOCAL_CPU_DETECT
+ # define EXTRA_SPEC_FUNCTIONS						\
 diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index 8c8be3c2740..1257616a659 100644
+index 34b8059b45b..4debacf3cb9 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -6789,11 +6789,22 @@
+@@ -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))]
@@ -122,10 +131,10 @@ index 8c8be3c2740..1257616a659 100644
  ;; instructions in the TLS stubs, in order to enable linker relaxation.
  ;; Therefore we treat the stubs as an atomic sequence.
 diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
-index d99d14c137d..08e52537dc6 100644
+index 92220b26ee2..68abc1764f6 100644
 --- a/gcc/config/aarch64/aarch64.opt
 +++ b/gcc/config/aarch64/aarch64.opt
-@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
+@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
  EnumValue
  Enum(aarch64_tls_size) String(48) Value(48)
  
@@ -147,21 +156,21 @@ index d99d14c137d..08e52537dc6 100644
  march=
  Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
  Use features of architecture ARCH.
-@@ -256,7 +271,7 @@ TargetVariable
+@@ -260,7 +275,7 @@ TargetVariable
  long aarch64_stack_protector_guard_offset = 0
  
  moutline-atomics
--Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
-+Target Report Var(aarch64_flag_outline_atomics) Save
+-Target Var(aarch64_flag_outline_atomics) Init(2) Save
++Target Var(aarch64_flag_outline_atomics) Save
  Generate local calls to out-of-line atomic operations.
  
  -param=aarch64-sve-compare-costs=
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 11d20b7be14..02ca761d3bf 100644
+index ba74abc0a43..5202ec05d0b 100644
 --- a/gcc/config/aarch64/t-aarch64
 +++ b/gcc/config/aarch64/t-aarch64
-@@ -159,8 +159,10 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
- 		$(srcdir)/config/aarch64/aarch64-bti-insert.c
+@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
+ 		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
  
  comma=,
 -MULTILIB_OPTIONS    = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
@@ -175,10 +184,10 @@ index 11d20b7be14..02ca761d3bf 100644
  s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
 diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
-index 00000000000..11ba0f5ab1c
+index 00000000000..a25459e4352
 --- /dev/null
 +++ b/gcc/config/devkitpro.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -207,6 +216,7 @@ index 00000000000..11ba0f5ab1c
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
++        builtin_define ("__DEVKITPRO__");       \
 +    } while (0)
 +
 +
@@ -245,53 +255,27 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-index 250fef59b55..36b2239aa5d 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
- 
+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?  */
--static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
--
+ /* 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;
- 
-@@ -88,9 +85,6 @@ static void *
- mingw32_gt_pch_get_address (size_t size, int)
- {
-   void* res;
--  size = (size + va_granularity - 1) & ~(va_granularity - 1);
--  if (size > pch_VA_max_size)
--    return NULL;
- 
-   /* FIXME: We let system determine base by setting first arg to NULL.
-      Allocating at top of available address space avoids unnecessary
-@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
-      If we allocate at bottom we need to reserve the address as early
-      as possible and at the same point in each invocation. */
-  
--  res = VirtualAlloc (NULL, pch_VA_max_size,
-+  res = VirtualAlloc (NULL, size,
- 		      MEM_RESERVE | MEM_TOP_DOWN,
- 		      PAGE_NOACCESS);
-   if (!res)
-@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
- 
-   /* Offset must be also be a multiple of allocation granularity for
-      this to work.  We can't change the offset. */ 
--  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
-+  if ((offset & (va_granularity - 1)) != 0)
-     return -1;
- 
- 
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..97f52d0b893 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -793,6 +793,11 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index bb07cc244e3..eff31f5093d 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -860,6 +860,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -303,7 +287,7 @@ index 9f790db0daf..97f52d0b893 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -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;
@@ -311,7 +295,7 @@ index 9f790db0daf..97f52d0b893 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
+@@ -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),
@@ -319,8 +303,21 @@ index 9f790db0daf..97f52d0b893 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+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/libgcc/gthr.h b/libgcc/gthr.h
-index f31cf083cbe..649f900aac3 100644
+index 7943c94f6d1..6d23362f7f0 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -333,10 +330,10 @@ index f31cf083cbe..649f900aac3 100644
  #define GTHREAD_USE_WEAK 0
  #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 80aeb3f8959..308ceedc673 100644
+index 7708f4cf6c5..d3f484a5623 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
-@@ -1315,6 +1315,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -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' \
@@ -345,10 +342,10 @@ index 80aeb3f8959..308ceedc673 100644
  	    < $< > $@
  
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index eb437ad8d8d..6e076fc63bd 100644
+index 7023c2de23e..d150a616d13 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
-@@ -1793,6 +1793,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -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' \

dka64/scripts/build-crtls.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.gz
+cd devkita64-rules-$DKA64_RULES_VER
+make install

dka64/scripts/build-gcc.sh

@@ -10,7 +10,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
         --prefix=$prefix --target=$target --disable-nls --disable-werror \
 	--enable-lto --enable-plugins --enable-poison-system-directories \
 	$CROSS_PARAMS \
@@ -39,9 +39,6 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -52,7 +49,7 @@ then
 		--enable-cxx-flags='-ffunction-sections' \
 		--disable-libstdcxx-verbose \
 		--enable-poison-system-directories \
-		--enable-interwork --enable-multilib \
+		--enable-multilib \
 		--enable-threads --disable-win32-registry --disable-nls --disable-debug\
 		--disable-libmudflap --disable-libssp --disable-libgomp \
 		--disable-libstdcxx-pch \
@@ -62,11 +59,13 @@ then
 		--with-newlib=yes \
 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 		--prefix=$prefix \
-		--enable-lto $plugin_ld\
-		--with-system-zlib \
-		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 15" \
+		--enable-lto \
+		--disable-tm-clone-registry \
+		--disable-__cxa_atexit \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 21" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+		$EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -148,43 +147,3 @@ then
 fi
 
 rm -fr $prefix/$target/sys-include
-
-cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-PLATFORM=`uname -s`
-
-if [ ! -f configured-gdb ]
-then
-	CPPFLAGS="$cppflags" \
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
-	../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	|| { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-
-#---------------------------------------------------------------------------------
-# copy base rulesets
-#---------------------------------------------------------------------------------
-cp -v $BUILDSCRIPTDIR/dka64/rules/* $prefix

dkarm-eabi/patches/gcc-10.1.0.patch

@@ -1,238 +0,0 @@
-diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 728be500b80..74c1abad635 100644
---- a/gcc/config/arm/arm-cpus.in
-+++ b/gcc/config/arm/arm-cpus.in
-@@ -392,7 +392,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 3d92bd23322..35cefcde676 100644
---- a/gcc/config/arm/t-arm-elf
-+++ b/gcc/config/arm/t-arm-elf
-@@ -16,111 +16,14 @@
- # 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
--
--# 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
--
--# 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 mfloat-abi=hard
-+MULTILIB_DIRNAMES    = thumb be armv6k fpu
- 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 
- 
--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
- 
--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
-diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index 9ad2947505f..1790caa8e88 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/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-index 250fef59b55..36b2239aa5d 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -44,9 +44,6 @@ 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?  */
--static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
--
- /* Granularity for reserving address space.  */
- static size_t va_granularity = 0x10000;
- 
-@@ -88,9 +85,6 @@ static void *
- mingw32_gt_pch_get_address (size_t size, int)
- {
-   void* res;
--  size = (size + va_granularity - 1) & ~(va_granularity - 1);
--  if (size > pch_VA_max_size)
--    return NULL;
- 
-   /* FIXME: We let system determine base by setting first arg to NULL.
-      Allocating at top of available address space avoids unnecessary
-@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
-      If we allocate at bottom we need to reserve the address as early
-      as possible and at the same point in each invocation. */
-  
--  res = VirtualAlloc (NULL, pch_VA_max_size,
-+  res = VirtualAlloc (NULL, size,
- 		      MEM_RESERVE | MEM_TOP_DOWN,
- 		      PAGE_NOACCESS);
-   if (!res)
-@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
- 
-   /* Offset must be also be a multiple of allocation granularity for
-      this to work.  We can't change the offset. */ 
--  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
-+  if ((offset & (va_granularity - 1)) != 0)
-     return -1;
- 
- 
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..97f52d0b893 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -793,6 +793,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  \
-@@ -1085,6 +1090,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;
-@@ -1582,6 +1588,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

dkarm-eabi/patches/gcc-12.2.0.patch

@@ -0,0 +1,370 @@
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index c5064dd3766..b244608f001 100644
+--- a/gcc/config.gcc
++++ 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
+- 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 1459afea921..72e1d20861d 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 bfb294beaa3..7e2e1c7bbbe 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/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/gcc.cc b/gcc/gcc.cc
+index bb07cc244e3..eff31f5093d 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -860,6 +860,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  \
+@@ -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;
++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;
+@@ -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),
++  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 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/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' \
+ 	    < $< > $@
+ 

dkarm-eabi/patches/gdb-8.2.1.patch

@@ -1,597 +0,0 @@
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 9799a7a65d..ccd3f8a626 100644
---- a/gdb/Makefile.in
-+++ b/gdb/Makefile.in
-@@ -684,6 +684,7 @@ ALL_TARGET_OBS = \
- 	arch/arm-linux.o \
- 	arch/i386.o \
- 	arch/ppc-linux-common.o \
-+	arm-3ds-tdep.o \
- 	arm-bsd-tdep.o \
- 	arm-fbsd-tdep.o \
- 	arm-linux-tdep.o \
-@@ -2213,6 +2214,7 @@ ALLDEPFILES = \
- 	amd64-tdep.c \
- 	arc-tdep.c \
- 	arm.c \
-+	arm-3ds-tdep.c \
- 	arm-bsd-tdep.c \
- 	arm-fbsd-nat.c \
- 	arm-fbsd-tdep.c \
-diff --git a/gdb/arm-3ds-tdep.c b/gdb/arm-3ds-tdep.c
-new file mode 100644
-index 0000000000..c41336982b
---- /dev/null
-+++ b/gdb/arm-3ds-tdep.c
-@@ -0,0 +1,291 @@
-+/* Target-dependent code for 3DS. */
-+
-+/* This uses code from GDB, which license is: */
-+
-+/*
-+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program 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 of the License, or
-+   (at your option) any later version.
-+
-+   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include "defs.h"
-+#include "gdbcore.h"
-+#include "target.h"
-+#include "osabi.h"
-+#include "xml-syscall.h"
-+
-+#include "arch/arm.h"
-+#include "arch/arm-get-next-pcs.h"
-+#include "arm-tdep.h"
-+
-+static const gdb_byte arm_3ds_arm_le_breakpoint[] = {0xff, 0x00, 0x00, 0xef};
-+static const gdb_byte arm_3ds_thumb_le_breakpoint[] = {0xff, 0xdf};
-+
-+static CORE_ADDR
-+  arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
-+
-+/* Operation function pointers for get_next_pcs.  */
-+static struct arm_get_next_pcs_ops arm_3ds_get_next_pcs_ops = {
-+  arm_get_next_pcs_read_memory_unsigned_integer,
-+  arm_3ds_get_next_pcs_syscall_next_pc,
-+  arm_get_next_pcs_addr_bits_remove,
-+  arm_get_next_pcs_is_thumb,
-+  NULL,
-+};
-+
-+/* single_step() is called just before we want to resume the inferior,
-+   if we want to single-step it but there is no hardware or kernel
-+   single-step support.  We find the target of the coming instructions
-+   and breakpoint them.  */
-+
-+std::vector<CORE_ADDR>
-+arm_3ds_software_single_step (struct regcache *regcache)
-+{
-+  struct gdbarch *gdbarch = regcache->arch ();
-+  struct arm_get_next_pcs next_pcs_ctx;
-+
-+  arm_get_next_pcs_ctor (&next_pcs_ctx,
-+			 &arm_3ds_get_next_pcs_ops,
-+			 gdbarch_byte_order (gdbarch),
-+			 gdbarch_byte_order_for_code (gdbarch),
-+			 0,
-+			 regcache);
-+
-+  std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
-+
-+  for (CORE_ADDR &pc_ref : next_pcs)
-+    pc_ref = gdbarch_addr_bits_remove (gdbarch, pc_ref);
-+
-+  return next_pcs;
-+}
-+
-+static CORE_ADDR
-+arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
-+{
-+  CORE_ADDR next_pc = 0;
-+  CORE_ADDR pc = regcache_read_pc (self->regcache);
-+  int is_thumb = arm_is_thumb (self->regcache);
-+  ULONGEST svc_number = 0;
-+
-+  if (is_thumb)
-+    {
-+      next_pc = pc + 2;
-+    }
-+  else
-+    {
-+      next_pc = pc + 4;
-+    }
-+
-+  /* Addresses for calling Thumb functions have the bit 0 set.  */
-+  if (is_thumb)
-+    next_pc = MAKE_THUMB_ADDR (next_pc);
-+
-+  return next_pc;
-+}
-+
-+static LONGEST
-+arm_3ds_get_syscall_number (struct gdbarch *gdbarch,
-+			      thread_info *thread)
-+{
-+  struct regcache *regs = get_thread_regcache (thread);
-+
-+  ULONGEST pc;
-+  ULONGEST cpsr;
-+  ULONGEST t_bit = arm_psr_thumb_bit (gdbarch);
-+  int is_thumb;
-+  ULONGEST svc_number = -1;
-+
-+  regcache_cooked_read_unsigned (regs, ARM_PC_REGNUM, &pc);
-+  regcache_cooked_read_unsigned (regs, ARM_PS_REGNUM, &cpsr);
-+  is_thumb = (cpsr & t_bit) != 0;
-+
-+  if (is_thumb)
-+    {
-+      enum bfd_endian byte_order_for_code =
-+	gdbarch_byte_order_for_code (gdbarch);
-+
-+      /* PC gets incremented before the syscall-stop, so read the
-+	 previous instruction.  */
-+      unsigned long this_instr =
-+	read_memory_unsigned_integer (pc - 2, 2, byte_order_for_code);
-+
-+      unsigned long svc_operand = (0x00ff & this_instr);
-+      svc_number = svc_operand;
-+    }
-+  else
-+    {
-+      enum bfd_endian byte_order_for_code =
-+	gdbarch_byte_order_for_code (gdbarch);
-+
-+      /* PC gets incremented before the syscall-stop, so read the
-+	 previous instruction.  */
-+      unsigned long this_instr =
-+	read_memory_unsigned_integer (pc - 4, 4, byte_order_for_code);
-+
-+      unsigned long svc_operand = (0x000000ff & this_instr);
-+      svc_number = svc_operand;
-+    }
-+
-+  if (svc_number == 0xfe)
-+    {
-+      regcache_cooked_read_unsigned (regs, 12, &svc_number);
-+    }
-+
-+  return svc_number;
-+}
-+
-+/* Implement the breakpoint_kind_from_pc gdbarch method.  */
-+
-+static int
-+arm_3ds_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
-+{
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch);
-+
-+  if (arm_pc_is_thumb (gdbarch, *pcptr))
-+    {
-+      *pcptr = UNMAKE_THUMB_ADDR (*pcptr);
-+
-+      /* If we have a separate 32-bit breakpoint instruction for Thumb-2,
-+	 check whether we are replacing a 32-bit instruction.  */
-+      if (tdep->thumb2_breakpoint != NULL)
-+	{
-+	  gdb_byte buf[2];
-+
-+	  if (target_read_memory (*pcptr, buf, 2) == 0)
-+	    {
-+	      unsigned short inst1;
-+
-+	      inst1 = extract_unsigned_integer (buf, 2, byte_order_for_code);
-+	      if (thumb_insn_size (inst1) == 4)
-+		return ARM_BP_KIND_THUMB2;
-+	    }
-+	}
-+
-+      return ARM_BP_KIND_THUMB;
-+    }
-+  else
-+    return ARM_BP_KIND_ARM;
-+
-+}
-+
-+/* Implement the sw_breakpoint_from_kind gdbarch method.  */
-+
-+static const gdb_byte *
-+arm_3ds_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size)
-+{
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+
-+  switch (kind)
-+    {
-+    case ARM_BP_KIND_ARM:
-+      *size = tdep->arm_breakpoint_size;
-+      return tdep->arm_breakpoint;
-+    case ARM_BP_KIND_THUMB:
-+      *size = tdep->thumb_breakpoint_size;
-+      return tdep->thumb_breakpoint;
-+    case ARM_BP_KIND_THUMB2:
-+      *size = tdep->thumb2_breakpoint_size;
-+      return tdep->thumb2_breakpoint;
-+    default:
-+      gdb_assert_not_reached ("unexpected arm breakpoint kind");
-+    }
-+}
-+
-+/* Implement the breakpoint_kind_from_current_state gdbarch method.  */
-+
-+static int
-+arm_3ds_breakpoint_kind_from_current_state (struct gdbarch *gdbarch,
-+					struct regcache *regcache,
-+					CORE_ADDR *pcptr)
-+{
-+  gdb_byte buf[4];
-+
-+  /* Check the memory pointed by PC is readable.  */
-+  if (target_read_memory (regcache_read_pc (regcache), buf, 4) == 0)
-+    {
-+      struct arm_get_next_pcs next_pcs_ctx;
-+
-+      arm_get_next_pcs_ctor (&next_pcs_ctx,
-+			     &arm_3ds_get_next_pcs_ops,
-+			     gdbarch_byte_order (gdbarch),
-+			     gdbarch_byte_order_for_code (gdbarch),
-+			     0,
-+			     regcache);
-+
-+      std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
-+
-+      /* If MEMADDR is the next instruction of current pc, do the
-+	 software single step computation, and get the thumb mode by
-+	 the destination address.  */
-+      for (CORE_ADDR pc : next_pcs)
-+	{
-+	  if (UNMAKE_THUMB_ADDR (pc) == *pcptr)
-+	    {
-+	      if (IS_THUMB_ADDR (pc))
-+		{
-+		  *pcptr = MAKE_THUMB_ADDR (*pcptr);
-+		  return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
-+		}
-+	      else
-+		return ARM_BP_KIND_ARM;
-+	    }
-+	}
-+    }
-+
-+  return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
-+}
-+
-+static void
-+arm_3ds_init_abi (struct gdbarch_info info,
-+			    struct gdbarch *gdbarch)
-+{
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+
-+  switch (info.byte_order)
-+    {
-+    case BFD_ENDIAN_LITTLE:
-+      tdep->arm_breakpoint = arm_3ds_arm_le_breakpoint;
-+      tdep->thumb_breakpoint = arm_3ds_thumb_le_breakpoint;
-+      tdep->arm_breakpoint_size = sizeof (arm_3ds_arm_le_breakpoint);
-+      tdep->thumb_breakpoint_size = sizeof (arm_3ds_thumb_le_breakpoint);
-+      break;
-+
-+    default:
-+      internal_error (__FILE__, __LINE__,
-+        _("arm_gdbarch_init: bad byte order"));
-+    }
-+  tdep->fp_model = ARM_FLOAT_VFP;
-+
-+  /* Single stepping.  */
-+  set_gdbarch_software_single_step (gdbarch, arm_3ds_software_single_step);
-+
-+  /* Breakpoint manipulation.  */
-+  set_gdbarch_breakpoint_kind_from_pc (gdbarch, arm_3ds_breakpoint_kind_from_pc);
-+  set_gdbarch_sw_breakpoint_from_kind (gdbarch, arm_3ds_sw_breakpoint_from_kind);
-+  set_gdbarch_breakpoint_kind_from_current_state (gdbarch,
-+						  arm_3ds_breakpoint_kind_from_current_state);
-+
-+  /* `catch syscall' */
-+  set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
-+  set_gdbarch_get_syscall_number (gdbarch, arm_3ds_get_syscall_number);
-+}
-+
-+void
-+_initialize_arm_3ds_tdep (void)
-+{
-+  gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
-+                          arm_3ds_init_abi);
-+}
-diff --git a/gdb/configure.tgt b/gdb/configure.tgt
-index f197160896..e2835ddef5 100644
---- a/gdb/configure.tgt
-+++ b/gdb/configure.tgt
-@@ -61,7 +61,7 @@ arc*-*-*)
- 	;;
- 
- arm*-*-*)
--	cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o";;
-+	cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o arm-3ds-tdep.o";;
- 
- hppa*-*-*)
- 	# Target: HP PA-RISC
-diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
-index 753e0b69a3..645eb043b9 100644
---- a/gdb/data-directory/Makefile.in
-+++ b/gdb/data-directory/Makefile.in
-@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
- 	sparc-linux.xml \
- 	sparc64-linux.xml
- 
--SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
-+SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml arm-3ds.xml $(GEN_SYSCALLS_FILES)
- 
- PYTHON_DIR = python
- PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
-diff --git a/gdb/defs.h b/gdb/defs.h
-index fc4217005a..a179a6d820 100644
---- a/gdb/defs.h
-+++ b/gdb/defs.h
-@@ -495,6 +495,7 @@ enum gdb_osabi
-   GDB_OSABI_LYNXOS178,
-   GDB_OSABI_NEWLIB,
-   GDB_OSABI_SDE,
-+  GDB_OSABI_3DS,
- 
-   GDB_OSABI_INVALID		/* keep this last */
- };
-diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
-index fa4e06e794..b6afc4cc7c 100644
---- a/gdb/dtrace-probe.c
-+++ b/gdb/dtrace-probe.c
-@@ -100,7 +100,7 @@ public:
- 
- /* DTrace static_probe_ops.  */
- 
--const dtrace_static_probe_ops dtrace_static_probe_ops;
-+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
- 
- /* The following structure represents a dtrace probe.  */
- 
-diff --git a/gdb/osabi.c b/gdb/osabi.c
-index 7d0540b181..49d3f78331 100644
---- a/gdb/osabi.c
-+++ b/gdb/osabi.c
-@@ -80,6 +80,7 @@ static const struct osabi_names gdb_osabi_names[] =
-   { "LynxOS178", NULL },
-   { "Newlib", NULL },
-   { "SDE", NULL },
-+  { "3DS", NULL },
- 
-   { "<invalid>", NULL }
- };
-diff --git a/gdb/probe.c b/gdb/probe.c
-index 1f3da213ef..4acbeb8704 100644
---- a/gdb/probe.c
-+++ b/gdb/probe.c
-@@ -60,7 +60,7 @@ public:
- 
- /* Static operations associated with a generic probe.  */
- 
--const any_static_probe_ops any_static_probe_ops;
-+const any_static_probe_ops any_static_probe_ops = {};
- 
- /* A helper for parse_probes that decodes a probe specification in
-    SEARCH_PSPACE.  It appends matching SALs to RESULT.  */
-diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
-index 09a3f6cc5c..9f90a6b436 100644
---- a/gdb/record-btrace.c
-+++ b/gdb/record-btrace.c
-@@ -144,7 +144,7 @@ static record_btrace_target record_btrace_ops;
- 
- /* Token associated with a new-thread observer enabling branch tracing
-    for the new thread.  */
--static const gdb::observers::token record_btrace_thread_observer_token;
-+static const gdb::observers::token record_btrace_thread_observer_token = {};
- 
- /* Memory access types used in set/show record btrace replay-memory-access.  */
- static const char replay_memory_access_read_only[] = "read-only";
-diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
-index ed7e1a0d3f..42fad3835f 100644
---- a/gdb/stap-probe.c
-+++ b/gdb/stap-probe.c
-@@ -119,7 +119,7 @@ public:
- 
- /* SystemTap static_probe_ops.  */
- 
--const stap_static_probe_ops stap_static_probe_ops;
-+const stap_static_probe_ops stap_static_probe_ops = {};
- 
- class stap_probe : public probe
- {
-diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
-new file mode 100644
-index 0000000000..48780b7bd5
---- /dev/null
-+++ b/gdb/syscalls/arm-3ds.xml
-@@ -0,0 +1,159 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
-+<!-- This file is located inside GDB and is based on files which license are: -->
-+<!-- Copyright (C) 2009-2017 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  This file is offered as-is,
-+     without any warranty. -->
-+<syscalls_info>
-+  <syscall name="ControlMemory" number="1" groups="memory"/>
-+  <syscall name="QueryMemory" number="2" groups="memory"/>
-+
-+  <syscall name="ExitProcess" number="3" groups="process"/>
-+  <syscall name="GetProcessAffinityMask" number="4" groups="process"/>
-+  <syscall name="SetProcessAffinityMask" number="5" groups="process"/>
-+  <syscall name="GetProcessIdealProcessor" number="6" groups="process"/>
-+  <syscall name="SetProcessIdealProcessor" number="7" groups="process"/>
-+
-+  <syscall name="CreateThread" number="8" groups="thread"/>
-+  <syscall name="ExitThread" number="9" groups="thread"/>
-+  <syscall name="SleepThread" number="10" groups="thread"/>
-+  <syscall name="GetThreadPriority" number="11" groups="thread"/>
-+  <syscall name="SetThreadPriority" number="12" groups="thread"/>
-+  <syscall name="GetThreadAffinityMask" number="13" groups="thread"/>
-+  <syscall name="SetThreadAffinityMask" number="14" groups="thread"/> <!-- removed -->
-+  <syscall name="GetThreadIdealProcessor" number="15" groups="thread"/>
-+  <syscall name="SetThreadIdealProcessor" number="16" groups="thread"/> <!-- removed -->
-+  <syscall name="GetCurrentProcessorNumber" number="17" groups="thread"/>
-+  <syscall name="Run" number="18" groups="thread"/>
-+
-+  <syscall name="CreateMutex" number="19" groups="synchronization"/>
-+  <syscall name="ReleaseMutex" number="20" groups="synchronization"/>
-+  <syscall name="CreateSemaphore" number="21" groups="synchronization"/>
-+  <syscall name="ReleaseSemaphore" number="22" groups="synchronization"/>
-+  <syscall name="CreateEvent" number="23" groups="synchronization"/>
-+  <syscall name="SignalEvent" number="24" groups="synchronization"/>
-+  <syscall name="ClearEvent" number="25" groups="synchronization"/>
-+  <syscall name="CreateTimer" number="26" groups="synchronization"/>
-+  <syscall name="SetTimer" number="27" groups="synchronization"/>
-+  <syscall name="CancelTimer" number="28" groups="synchronization"/>
-+  <syscall name="ClearTimer" number="29" groups="synchronization"/>
-+
-+  <syscall name="CreateMemoryBlock" number="30" groups="memory,ipc"/>
-+  <syscall name="MapMemoryBlock" number="31" groups="memory,ipc"/>
-+  <syscall name="UnmapMemoryBlock" number="32" groups="memory,ipc"/>
-+
-+  <syscall name="CreateAddressArbiter" number="33" groups="memory,synchronization"/>
-+  <syscall name="ArbitrateAddress" number="34" groups="memory,synchronization"/>
-+
-+  <syscall name="CloseHandle" number="35" groups="synchronization,ipc,memory,thread,process,debug"/>
-+  <syscall name="WaitSynchronization" number="36" groups="synchronization,ipc,thread,process,debug"/>
-+  <syscall name="WaitSynchronizationN" number="37" groups="synchronization,ipc,thread,process,debug"/>
-+  <syscall name="SignalAndWait" number="38" groups="synchronization"/> <!-- removed -->
-+  <syscall name="DuplicateHandle" number="39" groups="synchronization,ipc,memory,thread,process,debug"/>
-+
-+  <syscall name="GetSystemTick" number="40" groups="information"/>
-+  <syscall name="GetHandleInfo" number="41" groups="information,synchronization,ipc,memory,thread,process,debug"/>
-+  <syscall name="GetSystemInfo" number="42" groups="information"/>
-+  <syscall name="GetProcessInfo" number="43" groups="information,process"/>
-+  <syscall name="GetThreadInfo" number="44" groups="information,thread"/>
-+
-+  <syscall name="ConnectToPort" number="45" groups="ipc"/>
-+  <syscall name="GetCFWInfo" number="46" groups="custom,information"/> <!-- deprecated -->
-+  <syscall name="SendSyncRequest2" number="47" groups="ipc"/> <!-- removed -->
-+  <syscall name="SendSyncRequest3" number="48" groups="ipc"/> <!-- removed -->
-+  <syscall name="SendSyncRequest4" number="49" groups="ipc"/> <!-- removed -->
-+  <syscall name="SendSyncRequest" number="50" groups="ipc"/> <!-- removed -->
-+
-+  <syscall name="OpenProcess" number="51" groups="process"/>
-+  <syscall name="OpenThread" number="52" groups="thread"/>
-+
-+  <syscall name="GetProcessId" number="53" groups="process"/>
-+  <syscall name="GetProcessIdOfThread" number="54" groups="process,thread"/>
-+  <syscall name="GetThreadId" number="55" groups="thread"/>
-+
-+  <syscall name="GetResourceLimit" number="56" groups="process"/>
-+  <syscall name="GetResourceLimitLimitValues" number="57" groups="process"/>
-+  <syscall name="GetResourceLimitCurrentValues" number="58" groups="process"/>
-+
-+  <syscall name="GetThreadContext" number="59" groups="debug,thread"/> <!-- removed -->
-+  <syscall name="Break" number="60" groups="debug"/>
-+  <syscall name="OutputDebugString" number="61" groups="debug"/>
-+  <syscall name="ControlPerformanceCounter" number="62" groups="debug"/>
-+
-+  <syscall name="CreatePort" number="71" groups="ipc"/>
-+  <syscall name="CreateSessionToPort" number="72" groups="ipc"/>
-+  <syscall name="CreateSession" number="73" groups="ipc"/>
-+  <syscall name="AcceptSession" number="74" groups="ipc"/>
-+  <syscall name="ReplyAndReceive1" number="75" groups="ipc"/>
-+  <syscall name="ReplyAndReceive2" number="76" groups="ipc"/>
-+  <syscall name="ReplyAndReceive3" number="77" groups="ipc"/>
-+  <syscall name="ReplyAndReceive4" number="78" groups="ipc"/>
-+  <syscall name="ReplyAndReceive" number="79" groups="ipc"/>
-+
-+  <syscall name="BindInterrupt" number="80" groups="io,synchronization"/>
-+  <syscall name="UnbindInterrupt" number="81" groups="io,synchronization"/>
-+  <syscall name="InvalidateProcessDataCache" number="82" groups="io,memory,process"/>
-+  <syscall name="StoreProcessDataCache" number="83" groups="io,memory,process"/>
-+  <syscall name="FlushProcessDataCache" number="84" groups="io,memory,process"/>
-+
-+  <syscall name="StartInterprocessDma" number="85" groups="io,memory,ipc"/>
-+  <syscall name="StopDma" number="86" groups="io,memory,ipc"/>
-+  <syscall name="GetDmaState" number="87" groups="io,memory,ipc"/>
-+  <syscall name="RestartDma" number="88" groups="io,memory,ipc"/>
-+
-+  <syscall name="SetGpuProt" number="89" groups="io"/>
-+  <syscall name="SetWifiEnabled" number="90" groups="io"/>
-+
-+  <syscall name="DebugActiveProcess" number="96" groups="debug,process"/>
-+  <syscall name="BreakDebugProcess" number="97" groups="debug,process"/>
-+  <syscall name="TerminateDebugProcess" number="98" groups="debug,process"/>
-+  <syscall name="GetProcessDebugEvent" number="99" groups="debug"/>
-+  <syscall name="ContinueDebugEvent" number="100" groups="debug"/>
-+  <syscall name="GetProcessList" number="101" groups="information,debug,process"/>
-+  <syscall name="GetThreadList" number="102" groups="information,debug,thread"/>
-+  <syscall name="GetDebugThreadContext" number="103" groups="debug,thread"/>
-+  <syscall name="SetDebugThreadContext" number="104" groups="debug,thread"/>
-+  <syscall name="QueryDebugProcessMemory" number="105" groups="debug,process,memory"/>
-+  <syscall name="ReadProcessMemory" number="106" groups="debug,process,memory"/>
-+  <syscall name="WriteProcessMemory" number="107" groups="debug,process,memory"/>
-+  <syscall name="SetHardwareBreakPoint" number="108" group="debug"/>
-+  <syscall name="GetDebugThreadParam" number="109" group="debug,thread"/>
-+
-+  <syscall name="ControlProcessMemory" number="112" group="process,memory"/>
-+  <syscall name="MapProcessMemory" number="113" group="process,memory"/>
-+  <syscall name="UnmapProcessMemory" number="114" group="process,memory"/>
-+
-+  <syscall name="CreateCodeSet" number="115" group="process,memory"/>
-+  <syscall name="RandomStub" number="116" group="process,memory"/> <!-- removed -->
-+  <syscall name="CreateProcess" number="117" group="process"/>
-+  <syscall name="TerminateProcess" number="118" group="process"/>
-+  <syscall name="SetProcessResourceLimits" number="119" group="process"/>
-+  <syscall name="CreateResourceLimit" number="120" group="process"/>
-+  <syscall name="SetResourceLimitValues" number="121" group="process"/>
-+  <syscall name="AddCodeSegment" number="122" group="process"/> <!-- removed -->
-+
-+  <syscall name="Backdoor" number="123" group="kernel"/>
-+  <syscall name="KernelSetState" number="124" group="kernel"/>
-+
-+  <syscall name="QueryProcessMemory" number="125" group="process,memory"/>
-+
-+  <syscall name="CustomBackdoor" number="128" group="custom,kernel"/>
-+
-+  <syscall name="ConvertVAToPA" number="144" group="custom,io,memory"/>
-+  <syscall name="FlushDataCacheRange" number="145" group="custom,io,memory"/>
-+  <syscall name="FlushEntireDataCache" number="146" group="custom,io,memory"/>
-+  <syscall name="InvalidateInstructionCacheRange" number="147" group="custom,io,memory"/>
-+  <syscall name="InvalidateEntireInstructionCache" number="148" group="custom,io,memory"/>
-+
-+  <syscall name="MapProcessMemoryEx" number="160" group="custom,process,memory"/>
-+  <syscall name="UnmapProcessMemoryEx" number="161" group="custom,process,memory"/>
-+  <syscall name="ControlMemoryEx" number="162" group="custom,memory"/>
-+
-+  <syscall name="ControlService" number="176" group="custom,ipc"/>
-+  <syscall name="CopyHandle" number="177" groups="custom,synchronization,ipc,thread,process,debug"/>
-+  <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
-+
-+</syscalls_info>
-diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
-index efa02e2f08..1c341dcf47 100644
---- a/gdb/tui/tui-hooks.c
-+++ b/gdb/tui/tui-hooks.c
-@@ -205,7 +205,7 @@ tui_normal_stop (struct bpstats *bs, int print_frame)
- 
- /* Token associated with observers registered while TUI hooks are
-    installed.  */
--static const gdb::observers::token tui_observers_token;
-+static const gdb::observers::token tui_observers_token = {};
- 
- /* Attach or detach a single observer, according to ATTACH.  */
- 

dkarm-eabi/scripts/build-crtls.sh

@@ -11,9 +11,8 @@ export DEVKITARM=$DEVKITPRO/devkitARM
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p rules
-cd rules
-tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
+tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.gz
+cd devkitarm-rules-$DKARM_RULES_VER
 make install
 
 #---------------------------------------------------------------------------------
@@ -21,8 +20,7 @@ make install
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p crtls
-cd crtls
-tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
+tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz
+cd devkitarm-crtls-$DKARM_CRTLS_VER
 make install
 

dkarm-eabi/scripts/build-gcc.sh

@@ -64,9 +64,12 @@ then
 		--prefix=$prefix \
 		--enable-lto\
 		--with-system-zlib \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 54" \
+		--disable-tm-clone-registry \
+		--disable-__cxa_atexit \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 60" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+                $EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -150,35 +153,3 @@ fi
 rm -fr $prefix/$target/sys-include
 
 cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-PLATFORM=`uname -s`
-
-if [ ! -f configured-gdb ]
-then
-	CPPFLAGS="$cppflags $CPPFLAGS" \
-	LDFLAGS="$ldflags" \
-	../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	|| { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-

dkppc/patches/binutils-2.32.patch

@@ -1,12 +0,0 @@
-diff -NBaur binutils-2.31.1/opcodes/ppc-opc.c binutils-2.31.1-ppc/opcodes/ppc-opc.c
---- binutils-2.31.1/opcodes/ppc-opc.c	2018-06-24 19:38:58.000000000 +0100
-+++ binutils-2.31.1-ppc/opcodes/ppc-opc.c	2018-11-01 10:59:42.814553627 +0000
-@@ -3501,7 +3501,7 @@
- #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
- 		 | PPC_OPCODE_TITAN)
- #define BOOKE	PPC_OPCODE_BOOKE
--#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
-+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
- #define PPCE300 PPC_OPCODE_E300
- #define PPCSPE	PPC_OPCODE_SPE
- #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/binutils-2.34.patch

@@ -1,12 +0,0 @@
-diff -NBaur binutils-2.34/opcodes/ppc-opc.c binutils-2.34-ppc/opcodes/ppc-opc.c
---- binutils-2.34/opcodes/ppc-opc.c	2020-01-18 13:55:49.000000000 +0000
-+++ binutils-2.34-ppc/opcodes/ppc-opc.c	2020-05-22 10:47:37.900308413 +0000
-@@ -3747,7 +3747,7 @@
- #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
- 		 | PPC_OPCODE_TITAN)
- #define BOOKE	PPC_OPCODE_BOOKE
--#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
-+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
- #define PPCE300 PPC_OPCODE_E300
- #define PPCSPE	PPC_OPCODE_SPE
- #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/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

dkppc/patches/gcc-12.2.0.patch

@@ -10,50 +10,24 @@ index 4b937306ad0..bfd0375bd60 100644
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-index 250fef59b55..36b2239aa5d 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
- 
+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?  */
--static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
--
+ /* 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;
- 
-@@ -88,9 +85,6 @@ static void *
- mingw32_gt_pch_get_address (size_t size, int)
- {
-   void* res;
--  size = (size + va_granularity - 1) & ~(va_granularity - 1);
--  if (size > pch_VA_max_size)
--    return NULL;
- 
-   /* FIXME: We let system determine base by setting first arg to NULL.
-      Allocating at top of available address space avoids unnecessary
-@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
-      If we allocate at bottom we need to reserve the address as early
-      as possible and at the same point in each invocation. */
-  
--  res = VirtualAlloc (NULL, pch_VA_max_size,
-+  res = VirtualAlloc (NULL, size,
- 		      MEM_RESERVE | MEM_TOP_DOWN,
- 		      PAGE_NOACCESS);
-   if (!res)
-@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
- 
-   /* Offset must be also be a multiple of allocation granularity for
-      this to work.  We can't change the offset. */ 
--  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
-+  if ((offset & (va_granularity - 1)) != 0)
-     return -1;
- 
- 
 diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index 2e086f16de9..1c27c6467bc 100644
+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
@@ -65,19 +39,32 @@ index 2e086f16de9..1c27c6467bc 100644
  #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 1adc371d70f..a7e1220981c 100644
+index bc48f450210..7ba76802670 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
-@@ -196,6 +196,7 @@ ASM_OPT_ANY
+@@ -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.c.  */
+    the condition in driver-rs6000.cc.  */
 +#if 0
  #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
- /* In driver-rs6000.c.  */
+ /* In driver-rs6000.cc.  */
  extern const char *host_detect_local_cpu (int argc, const char **argv);
-@@ -207,6 +208,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -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
@@ -87,10 +74,10 @@ index 1adc371d70f..a7e1220981c 100644
  #ifndef CC1_CPU_SPEC
  #ifdef HAVE_LOCAL_CPU_DETECT
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..cede792d3a7 100644
+index 7e2519de5d4..bedfaf31808 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -589,7 +589,11 @@ GNU_USER_TARGET_CC1_SPEC
  
  /* Default starting address if specified.  */
  #define LINK_START_SPEC "\
@@ -103,7 +90,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(link_start_yellowknife) ; \
    mmvme        : %(link_start_mvme)        ; \
    msim         : %(link_start_sim)         ; \
-@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -620,7 +624,8 @@ GNU_USER_TARGET_CC1_SPEC
  
  /* Any specific OS flags.  */
  #define LINK_OS_SPEC "\
@@ -113,7 +100,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(link_os_yellowknife) ; \
    mmvme        : %(link_os_mvme)        ; \
    msim         : %(link_os_sim)         ; \
-@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -635,7 +640,10 @@ GNU_USER_TARGET_CC1_SPEC
  /* Override rs6000.h definition.  */
  #undef	CPP_SPEC
  #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -125,7 +112,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(cpp_os_yellowknife) ; \
    mmvme        : %(cpp_os_mvme)        ; \
    msim         : %(cpp_os_sim)         ; \
-@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -649,7 +657,10 @@ GNU_USER_TARGET_CC1_SPEC
  
  #undef	STARTFILE_SPEC
  #define	STARTFILE_SPEC "\
@@ -137,7 +124,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(startfile_yellowknife) ; \
    mmvme        : %(startfile_mvme)        ; \
    msim         : %(startfile_sim)         ; \
-@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -663,7 +674,8 @@ GNU_USER_TARGET_CC1_SPEC
  
  #undef	LIB_SPEC
  #define	LIB_SPEC "\
@@ -147,7 +134,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(lib_yellowknife) ; \
    mmvme        : %(lib_mvme)        ; \
    msim         : %(lib_sim)         ; \
-@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -673,11 +685,12 @@ GNU_USER_TARGET_CC1_SPEC
    mcall-openbsd: %(lib_openbsd)     ; \
                 : %(lib_default)     }"
  
@@ -162,7 +149,7 @@ index 9ade72114e9..cede792d3a7 100644
    myellowknife : %(endfile_yellowknife) ; \
    mmvme        : %(endfile_mvme)        ; \
    msim         : %(endfile_sim)         ; \
-@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -693,16 +706,27 @@ GNU_USER_TARGET_CC1_SPEC
  
  /* Motorola ADS support.  */
  #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -190,7 +177,7 @@ index 9ade72114e9..cede792d3a7 100644
  
  /* Motorola Yellowknife support.  */
  #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -851,6 +875,7 @@ ncrtn.o%s"
+@@ -850,6 +874,7 @@ ncrtn.o%s"
  #undef	SUBTARGET_EXTRA_SPECS
  #define	SUBTARGET_EXTRA_SPECS						\
    { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -198,7 +185,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "lib_ads",			LIB_ADS_SPEC },				\
    { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
    { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -860,6 +885,7 @@ ncrtn.o%s"
+@@ -859,6 +884,7 @@ ncrtn.o%s"
    { "lib_netbsd",		LIB_NETBSD_SPEC },			\
    { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
    { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -206,7 +193,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "startfile_ads",		STARTFILE_ADS_SPEC },			\
    { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
    { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -869,6 +895,7 @@ ncrtn.o%s"
+@@ -868,6 +894,7 @@ ncrtn.o%s"
    { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
    { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
    { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -214,7 +201,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "endfile_ads",		ENDFILE_ADS_SPEC },			\
    { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
    { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -880,7 +907,11 @@ ncrtn.o%s"
+@@ -879,7 +906,11 @@ ncrtn.o%s"
    { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
    { "link_shlib",		LINK_SHLIB_SPEC },			\
    { "link_start",		LINK_START_SPEC },			\
@@ -226,7 +213,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
    { "link_start_mvme",		LINK_START_MVME_SPEC },			\
    { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -890,6 +921,7 @@ ncrtn.o%s"
+@@ -889,6 +920,7 @@ ncrtn.o%s"
    { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
    { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
    { "link_os",			LINK_OS_SPEC },				\
@@ -234,7 +221,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "link_os_ads",		LINK_OS_ADS_SPEC },			\
    { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
    { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -901,6 +933,9 @@ ncrtn.o%s"
+@@ -900,6 +932,9 @@ 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 },			\
@@ -245,7 +232,7 @@ index 9ade72114e9..cede792d3a7 100644
    { "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 b49ba261f3c..4eda763dfca 100644
+index ac75d67b19a..bdee36872f8 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
 @@ -124,6 +124,26 @@ mads
@@ -276,10 +263,10 @@ index b49ba261f3c..4eda763dfca 100644
  Target RejectNegative
  Link with libyk.a, libc.a and crt0.o.
 diff --git a/gcc/configure b/gcc/configure
-index cd3d9516fce..fcb4b206b60 100755
+index 5ce0557719a..a1c59e87b83 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -12208,7 +12208,7 @@ case ${enable_threads} in
+@@ -12884,7 +12884,7 @@ case ${enable_threads} in
      # default
      target_thread_file='single'
      ;;
@@ -289,10 +276,10 @@ index cd3d9516fce..fcb4b206b60 100755
      target_thread_file=${enable_threads}
      ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 0de3b4bf97b..739aa4ae3da 100644
+index 23bee7010a3..4540b6d3aee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1800,7 +1800,7 @@ case ${enable_threads} in
+@@ -1994,7 +1994,7 @@ case ${enable_threads} in
      # default
      target_thread_file='single'
      ;;
@@ -302,7 +289,7 @@ index 0de3b4bf97b..739aa4ae3da 100644
      target_thread_file=${enable_threads}
      ;;
 diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
-index 260fe4d1af6..664808cd19c 100644
+index cf224657260..38683e58cb3 100644
 --- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
 @@ -24,7 +24,7 @@
@@ -320,7 +307,7 @@ index 260fe4d1af6..664808cd19c 100644
  #endif
 +#endif
 diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
-index 7e1d5c5df98..2c62480d165 100644
+index 65e791741f7..631be3ec5ba 100644
 --- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
 @@ -24,7 +24,7 @@
@@ -866,10 +853,10 @@ index fb812d3801f..7f6669d530f 100644
  
  # This can't end up in shared libgcc
 diff --git a/libgcc/configure b/libgcc/configure
-index 26bf75789e0..1f663d2cfb0 100755
+index 1f9b2ac578b..539fd961156 100755
 --- a/libgcc/configure
 +++ b/libgcc/configure
-@@ -5640,6 +5640,7 @@ tm_file="${tm_file_}"
+@@ -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 ;;
@@ -877,11 +864,24 @@ index 26bf75789e0..1f663d2cfb0 100755
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+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 9f9c5a2419a..c9bb6c548be 100755
+index eac60392121..d1c85de1e34 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -15637,6 +15637,7 @@ $as_echo "$target_thread_file" >&6; }
+@@ -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 ;;
@@ -889,3 +889,104 @@ index 9f9c5a2419a..c9bb6c548be 100755
      gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
+diff --git a/libstdc++-v3/include/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)

dkppc/patches/gdb-8.2.1.patch

@@ -1,60 +0,0 @@
-diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
---- gdb-8.2.1/gdb/dtrace-probe.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/dtrace-probe.c	2019-02-19 17:30:16.449175937 +0000
-@@ -100,7 +100,7 @@
- 
- /* DTrace static_probe_ops.  */
- 
--const dtrace_static_probe_ops dtrace_static_probe_ops;
-+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
- 
- /* The following structure represents a dtrace probe.  */
- 
-diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
---- gdb-8.2.1/gdb/probe.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/probe.c	2019-02-19 17:31:05.266578008 +0000
-@@ -60,7 +60,7 @@
- 
- /* Static operations associated with a generic probe.  */
- 
--const any_static_probe_ops any_static_probe_ops;
-+const any_static_probe_ops any_static_probe_ops = {};
- 
- /* A helper for parse_probes that decodes a probe specification in
-    SEARCH_PSPACE.  It appends matching SALs to RESULT.  */
-diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
---- gdb-8.2.1/gdb/record-btrace.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/record-btrace.c	2019-02-19 17:31:33.301731324 +0000
-@@ -144,7 +144,7 @@
- 
- /* Token associated with a new-thread observer enabling branch tracing
-    for the new thread.  */
--static const gdb::observers::token record_btrace_thread_observer_token;
-+static const gdb::observers::token record_btrace_thread_observer_token = {};
- 
- /* Memory access types used in set/show record btrace replay-memory-access.  */
- static const char replay_memory_access_read_only[] = "read-only";
-diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
---- gdb-8.2.1/gdb/stap-probe.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/stap-probe.c	2019-02-19 17:29:35.744567941 +0000
-@@ -119,7 +119,7 @@
- 
- /* SystemTap static_probe_ops.  */
- 
--const stap_static_probe_ops stap_static_probe_ops;
-+const stap_static_probe_ops stap_static_probe_ops = {};
- 
- class stap_probe : public probe
- {
-diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
---- gdb-8.2.1/gdb/tui/tui-hooks.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c	2019-02-19 17:28:53.178460364 +0000
-@@ -205,7 +205,7 @@
- 
- /* Token associated with observers registered while TUI hooks are
-    installed.  */
--static const gdb::observers::token tui_observers_token;
-+static const gdb::observers::token tui_observers_token = {};
- 
- /* Attach or detach a single observer, according to ATTACH.  */
- 

dkppc/scripts/build-crtls.sh

@@ -11,7 +11,6 @@ export DEVKITPPC=$DEVKITPRO/devkitPPC
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p rules
-cd rules
-tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
+tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.gz
+cd devkitppc-rules-$DKPPC_RULES_VER
 make install

dkppc/scripts/build-gcc.sh

@@ -12,7 +12,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
 	--prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \
 	--disable-werror \
 	--enable-poison-system-directories \
@@ -40,12 +40,15 @@ cd $BUILDDIR
 # build and install mn10200 binutils
 #---------------------------------------------------------------------------------
 
+# Use modern config.sub for aarch64 host
+cp binutils-$BINUTILS_VER/config.sub binutils-$MN_BINUTILS_VER/config.sub
+
 mkdir -p mn10200/binutils
 cd mn10200/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$MN_BINUTILS_VER/configure \
+	../../binutils-$MN_BINUTILS_VER/configure \
 	--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
 	--disable-multilib \
 	--disable-werror $CROSS_PARAMS \
@@ -73,11 +76,10 @@ cd $BUILDDIR
 mkdir -p $target/gcc
 cd $target/gcc
 
+export gcc_cv_libc_provides_ssp=yes
+
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -91,15 +93,17 @@ then
 	--disable-libstdcxx-verbose \
 	--enable-libstdcxx-time=yes \
 	--enable-libstdcxx-filesystem-ts \
+	--disable-tm-clone-registry \
+	--disable-__cxa_atexit \
 	--enable-cxx-flags='-ffunction-sections -fdata-sections' \
 	--target=$target \
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix \
-	--with-system-zlib\
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 37" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 41" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
+	$EXTRA_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	|| { echo "Error configuring gcc stage 1"; exit 1; }
 	touch configured-gcc
@@ -134,7 +138,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 \
@@ -187,31 +191,3 @@ echo "installing linkscripts ..."
 cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
 
 cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-if [ ! -f configured-gdb ]
-then
-	CFLAGS="$cflags" LDFLAGS="$ldflags" ../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	$CROSS_GCC_PARAMS || { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-

select_toolchain.sh

@@ -30,31 +30,28 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=10.1.0
-    BINUTILS_VER=2.32
-    NEWLIB_VER=3.3.0
-    GDB_VER=8.2.1
+    GCC_VER=12.2.0
+    BINUTILS_VER=2.40
+    NEWLIB_VER=4.3.0.20230120
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=10.1.0
-    BINUTILS_VER=2.34
-    MN_BINUTILS_VER=2.17
-    NEWLIB_VER=3.3.0
-    GDB_VER=8.2.1
+    GCC_VER=12.2.0
+    BINUTILS_VER=2.40
+    MN_BINUTILS_VER=2.24
+    NEWLIB_VER=4.3.0.20230120
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=10.1.0
+    GCC_VER=12.2.0
     BINUTILS_VER=2.32
-    NEWLIB_VER=3.3.0
-    GDB_VER=9.1
+    NEWLIB_VER=4.3.0.20230120
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf