devkitARM: remove stale patches

.gitignore

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

build-devkit.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 53-1
-#	devkitPPC release 36
-#	devkitA64 release 14
+#	devkitARM release 59
+#	devkitPPC release 41
+#	devkitA64 release 19
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -27,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}
 
@@ -56,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
 #---------------------------------------------------------------------------------
@@ -117,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
 
@@ -161,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
 
@@ -180,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"
-
-if [ $VERSION -eq 1 ]; then
-
-	archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
-fi
+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 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
+	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.gz devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz $archives"
+	fi
 
+	if [ $VERSION -eq 2 ]; then
+		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"
@@ -216,25 +215,25 @@ 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
+if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
 
 #---------------------------------------------------------------------------------
 # Build and install devkit components
 #---------------------------------------------------------------------------------
 if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 
-cd $BUILDSCRIPTDIR
 
-if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
-	cp -v	$CROSSBINPATH//libwinpthread-1.dll $prefix/bin
+if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ] && [ -f $scriptdir/build-crtls.sh ]; then
+  . $scriptdir/build-crtls.sh || { echo "Error building crtls & rules"; exit 1; }; cd $BUILDSCRIPTDIR;
 fi
 
-echo "stripping installed binaries"
-. ./strip_bins.sh
+cd $BUILDSCRIPTDIR
+
+if [ "$BUILD_DKPRO_NO_STRIP_BINARIES" != "1" ]; then
+	echo "stripping installed binaries"
+	. ./strip_bins.sh
+fi
 
 #---------------------------------------------------------------------------------
 # Clean up temporary files and source directories

config.sh.sample

@@ -31,9 +31,9 @@ BUILD_DKPRO_PACKAGE=0
 #export MAKEFLAGS="$MAKEFLAGS -j${numcores}"
 
 #---------------------------------------------------------------------------------
-# Uncomment to skip building of tools
+# Uncomment to skip building of crtls and rules files
 #---------------------------------------------------------------------------------
-#BUILD_DKPRO_SKIP_TOOLS=1
+#BUILD_DKPRO_SKIP_CRTLS=1
 
 # Automated script execution
 #---------------------------------------------------------------------------------

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.1.0.patch

@@ -1,54 +1,7 @@
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index ddd3b8f4d9d..014df2e5a59 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -985,6 +985,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
- 	case $target in
- 	aarch64-*-elf*)
- 		use_gcc_stdint=wrap
-+		tm_file="${tm_file} devkitpro.h"
-+		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
-+		extra_options="${extra_options} devkitpro.opt"
-+		case ${enable_threads} in
-+			"" | yes | posix) thread_file='posix' ;;
-+		esac
- 		;;
-         aarch64-*-fuchsia*)
-                 tm_file="${tm_file} fuchsia.h"
-diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index bbebd0ef029..8f38510402f 100644
---- a/gcc/config/aarch64/aarch64-elf-raw.h
-+++ b/gcc/config/aarch64/aarch64-elf-raw.h
-@@ -22,6 +22,7 @@
- #ifndef GCC_AARCH64_ELF_RAW_H
- #define GCC_AARCH64_ELF_RAW_H
- 
-+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
- #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
- #define ENDFILE_SPEC \
-   " crtend%O%s crtn%O%s " \
-diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
-index 4b07d296a11..037985f1d86 100644
---- a/gcc/config/aarch64/aarch64-opts.h
-+++ b/gcc/config/aarch64/aarch64-opts.h
-@@ -48,6 +48,12 @@ enum aarch64_tls_type {
-   TLS_DESCRIPTORS
- };
- 
-+/* Which thread pointer access sequence to use.  */
-+enum aarch64_tp_type {
-+  TP_HARD,
-+  TP_SOFT
-+};
-+
- /* The code model defines the address generation strategy.
-    Most have a PIC and non-PIC variant.  */
- enum aarch64_code_model {
-diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
-index 6b25d9cbfae..39c7026a90c 100644
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -13186,8 +13186,24 @@ aarch64_load_tp (rtx target)
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -19417,8 +19417,24 @@
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -75,11 +28,21 @@ index 6b25d9cbfae..39c7026a90c 100644
    return target;
  }
  
-diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index fc6df970c2e..705c6de868f 100644
---- a/gcc/config/aarch64/aarch64.h
-+++ b/gcc/config/aarch64/aarch64.h
-@@ -1006,6 +1006,10 @@ typedef struct
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h	2022-05-02 21:50:30.086094234 +0100
+@@ -22,6 +22,7 @@
+ #ifndef GCC_AARCH64_ELF_RAW_H
+ #define GCC_AARCH64_ELF_RAW_H
+ 
++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
+ #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
+ #define ENDFILE_SPEC \
+   " crtend%O%s crtn%O%s " \
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h	2022-05-02 21:50:30.090088643 +0100
+@@ -1245,6 +1245,10 @@
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -90,11 +53,19 @@ index fc6df970c2e..705c6de868f 100644
  extern enum aarch64_code_model aarch64_cmodel;
  
  /* When using the tiny addressing model conditional and unconditional branches
-diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index 5a1894063a1..7c9d9452659 100644
---- a/gcc/config/aarch64/aarch64.md
-+++ b/gcc/config/aarch64/aarch64.md
-@@ -6583,11 +6583,22 @@
+@@ -1290,7 +1294,7 @@
+ #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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md	2022-05-02 21:50:30.090088643 +0100
+@@ -6899,11 +6899,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -119,11 +90,10 @@ index 5a1894063a1..7c9d9452659 100644
  ;; The TLS ABI specifically requires that the compiler does not schedule
  ;; instructions in the TLS stubs, in order to enable linker relaxation.
  ;; Therefore we treat the stubs as an atomic sequence.
-diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
-index 7719c3b6352..cd32a639b16 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)
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt	2022-05-02 21:50:30.090088643 +0100
+@@ -122,6 +122,21 @@
  EnumValue
  Enum(aarch64_tls_size) String(48) Value(48)
  
@@ -143,30 +113,53 @@ index 7719c3b6352..cd32a639b16 100644
 +
 +
  march=
- Target RejectNegative ToLower Joined Var(aarch64_arch_string)
+ Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
  Use features of architecture ARCH.
-diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index ee471f8983f..aedaefdd62d 100644
---- a/gcc/config/aarch64/t-aarch64
-+++ b/gcc/config/aarch64/t-aarch64
-@@ -100,6 +100,8 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
- 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
- 		$(srcdir)/config/aarch64/aarch64-bti-insert.c
+@@ -260,7 +275,7 @@
+ long aarch64_stack_protector_guard_offset = 0
  
--comma=,
+ moutline-atomics
+-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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h	2022-05-02 21:50:30.086094234 +0100
+@@ -48,6 +48,12 @@
+   TLS_DESCRIPTORS
+ };
+ 
++/* Which thread pointer access sequence to use.  */
++enum aarch64_tp_type {
++  TP_HARD,
++  TP_SOFT
++};
++
+ /* The code model defines the address generation strategy.
+    Most have a PIC and non-PIC variant.  */
+ enum aarch64_code_model {
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64	2022-05-02 21:50:30.090088643 +0100
+@@ -177,8 +177,10 @@
+ 		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
+ 
+ comma=,
 -MULTILIB_OPTIONS    = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
 -MULTILIB_DIRNAMES   = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
-+ comma=,
 +MULTILIB_OPTIONS    = mcmodel=large fPIC
 +MULTILIB_DIRNAMES   = large pic
 +MULTILIB_REQUIRED   = mcmodel=large fPIC
 +MULTILIB_MATCHES    = fPIC=fpic fPIC=fpie fPIC=fPIE
-diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
-new file mode 100644
-index 00000000000..11ba0f5ab1c
---- /dev/null
-+++ b/gcc/config/devkitpro.h
-@@ -0,0 +1,31 @@
+ 
+ insn-conditions.md: s-check-sve-md
+ s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h	2022-05-02 22:04:49.962851033 +0100
+@@ -0,0 +1,29 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -196,13 +189,9 @@ index 00000000000..11ba0f5ab1c
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
 +    } 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
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt	1970-01-01 01:00:00.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt	2022-05-02 21:50:30.090088643 +0100
 @@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
@@ -233,11 +222,43 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4f57765b012..2899202cc05 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -794,6 +794,11 @@ proper position among the other output files.  */
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -45,7 +45,11 @@
+ 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 -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
+--- gcc-12.1.0-RC-20220429/gcc/config.gcc	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc	2022-05-02 21:50:30.086094234 +0100
+@@ -1093,7 +1093,14 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64"
+ 	case $target in
+ 	aarch64-*-elf*)
++		default_use_cxa_atexit=yes
+ 		use_gcc_stdint=wrap
++		tm_file="${tm_file} devkitpro.h"
++		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
++		extra_options="${extra_options} devkitpro.opt"
++		case ${enable_threads} in
++			"" | yes | posix) thread_file='posix' ;;
++		esac
+ 		;;
+         aarch64-*-fuchsia*)
+                 tm_file="${tm_file} fuchsia.h"
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -860,6 +860,11 @@
  #endif
  #endif
  
@@ -249,7 +270,7 @@ index 4f57765b012..2899202cc05 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1204,6 +1209,7 @@
  static const char *lib_spec = LIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -257,7 +278,7 @@ index 4f57765b012..2899202cc05 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] =
+@@ -1709,6 +1715,7 @@
    INIT_STATIC_SPEC ("lib",			&lib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -265,23 +286,22 @@ index 4f57765b012..2899202cc05 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 4927a9f8977..8311b6a7f5e 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c	2022-05-02 21:50:30.094083051 +0100
+@@ -325,7 +325,7 @@
  
- /* Target machine header files require this define. */
- #define IN_LIBGCC2
-+#define USED_FOR_TARGET
+ #ifdef OBJECT_FORMAT_ELF
  
- /* FIXME: Including auto-host is incorrect, but until we have
-    identified the set of defines that need to go into auto-target.h,
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 67826419882..d9f01c6c371 100644
---- a/libgcc/gthr.h
-+++ b/libgcc/gthr.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+-#if DEFAULT_USE_CXA_ATEXIT
++#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
+--- gcc-12.1.0-RC-20220429/libgcc/gthr.h	2022-04-29 14:58:25.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h	2022-05-02 21:50:30.094083051 +0100
+@@ -136,7 +136,7 @@
  /* The pe-coff weak support isn't fully compatible to ELF's weak.
     For static libraries it might would work, but as we need to deal
     with shared versions too, we disable it for mingw-targets.  */
@@ -290,11 +310,10 @@ index 67826419882..d9f01c6c371 100644
  #undef GTHREAD_USE_WEAK
  #define GTHREAD_USE_WEAK 0
  #endif
-diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 1deacb80ca2..0de11c15a3a 100644
---- a/libstdc++-v3/include/Makefile.am
-+++ b/libstdc++-v3/include/Makefile.am
-@@ -1338,6 +1338,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am	2022-04-29 14:58:26.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am	2022-05-02 21:50:30.094083051 +0100
+@@ -1366,6 +1366,7 @@
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
  	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -302,11 +321,10 @@ index 1deacb80ca2..0de11c15a3a 100644
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
-diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index bc475c6dd90..bfa3e71898a 100644
---- a/libstdc++-v3/include/Makefile.in
-+++ b/libstdc++-v3/include/Makefile.in
-@@ -1817,6 +1817,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in	2022-04-29 14:58:26.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in	2022-05-02 21:50:30.094083051 +0100
+@@ -1857,6 +1857,7 @@
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
  	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \

dka64/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-03-23 19:45:04.743529457 +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-03-23 19:35:59.701401090 +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-03-23 19:35:59.705388987 +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-03-23 19:35:59.705388987 +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-03-23 19:35:59.705388987 +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.  */
- 

dka64/patches/newlib-4.2.0.20211231.patch

@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 1a4033dce..ba7aea7b0 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
  
  fi
  
@@ -11,19 +11,19 @@ index 1a4033dce..ba7aea7b0 100755
  DEPDIR="${am__leading_dot}deps"
  
  ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 41843eed1..dc0e2a5fd 100644
---- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..577dfdec6 100644
+--- a/libgloss/configure.ac
++++ b/libgloss/configure.ac
 @@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
  AC_INIT([libgloss],[LIBGLOSS_VERSION])
  AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
  
  if test "${enable_shared}" = "yes" ; then
      echo "Shared libraries not supported for cross compiling, ignored"
-@@ -190,6 +191,7 @@ dnl fi
+@@ -196,6 +197,7 @@ dnl fi
  if test "${config_libnosys}" = "true"; then
    AC_CONFIG_SUBDIRS([libnosys])
  fi
@@ -5141,11 +5141,11 @@ index 000000000..aa653c235
 +
 +
 +
-diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
+diff --git a/libgloss/libsysbase/configure.ac b/libgloss/libsysbase/configure.ac
 new file mode 100644
 index 000000000..da85a3f46
 --- /dev/null
-+++ b/libgloss/libsysbase/configure.in
++++ b/libgloss/libsysbase/configure.ac
 @@ -0,0 +1,202 @@
 +# Copyright (c) 1995, 1996 Cygnus Support
 +#
@@ -8142,10 +8142,10 @@ index 000000000..b54e0ce7c
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -8153,24 +8153,33 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
++int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
++			ptr->deviceData = devoptab_list[dev]->deviceData;
++			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
++			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
++		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
++
++#ifndef _REENT_ONLY
++
++int
++rmdir (const char *filename)
++{
++  return _rmdir_r (_REENT, filename);
++}
++
++#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
 index 000000000..5dd550c5c
@@ -8739,10 +8748,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 6c49cb750..610b63e81 100644
+index c429dde1c..fd3171ad2 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -659,13 +659,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -686,13 +686,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
  	syscall_dir=syscalls
  	;;
    aarch64*-*-*)
@@ -8768,6 +8777,32 @@ index 6c49cb750..610b63e81 100644
    arm*-*-pe)
  	syscall_dir=syscalls
  	;;
+diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
+index 5e30f09be..1ea357f92 100644
+--- a/newlib/libc/ctype/jp2uc.c
++++ b/newlib/libc/ctype/jp2uc.c
+@@ -35,7 +35,7 @@
+ #ifdef _MB_CAPABLE
+ /* Under Cygwin, the incoming wide character is already given in UTF due
+    to the requirements of the underlying OS. */
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__DEVKITA64__)
+ 
+ #include <_ansi.h>
+ #include <string.h>
+diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
+index 5c293c83d..75ccf89f5 100644
+--- a/newlib/libc/ctype/local.h
++++ b/newlib/libc/ctype/local.h
+@@ -32,7 +32,7 @@
+    * for towupper and towlower, the result must be back-transformed
+      into the respective locale encoding; currently NOT IMPLEMENTED
+ */
+-#ifdef __CYGWIN__
++#if defined(__CYGWIN__) || defined(__DEVKITA64__)
+ /* Under Cygwin, wchar_t (or its extension wint_t) is Unicode */
+ #define _jp2uc(c) (c)
+ #define _jp2uc_l(c, l) (c)
 diff --git a/newlib/libc/include/fnmatch.h b/newlib/libc/include/fnmatch.h
 index a94e923a4..9171e98aa 100644
 --- a/newlib/libc/include/fnmatch.h
@@ -8831,10 +8866,10 @@ index 000000000..a71a5d847
 +
 +#endif
 diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
-index 893a5d064..da4b3a1ee 100644
+index 799ac494a..4174d72ab 100644
 --- a/newlib/libc/include/math.h
 +++ b/newlib/libc/include/math.h
-@@ -416,7 +416,7 @@ extern float hypotf (float, float);
+@@ -436,7 +436,7 @@ extern float hypotf (float, float);
     simply call the double functions.  On Cygwin the long double functions
     are implemented independently from newlib to be able to use optimized
     assembler functions despite using the Microsoft x86_64 ABI. */
@@ -8843,6 +8878,18 @@ index 893a5d064..da4b3a1ee 100644
  /* Reentrant ANSI C functions.  */
  #ifndef __math_68881
  extern long double atanl (long double);
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
++++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
++extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/semaphore.h b/newlib/libc/include/semaphore.h
 new file mode 100755
 index 000000000..4afb0e419
@@ -8918,6 +8965,19 @@ index 000000000..4afb0e419
 +#endif /* defined(_POSIX_SEMAPHORES) */
 +
 +#endif /* !_SEMAPHORE_H_ */
+diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
+index 7748351f0..e87104559 100644
+--- a/newlib/libc/include/stdio.h
++++ b/newlib/libc/include/stdio.h
+@@ -227,7 +227,7 @@ int	fgetpos (FILE *, _fpos_t *);
+ #else
+ int	fgetpos (FILE *__restrict, fpos_t *__restrict);
+ #endif
+-int	fseek (FILE *, long, int);
++int	fseek (FILE *, off_t, int);
+ #ifdef _LIBC
+ int	fsetpos (FILE *, const _fpos_t *);
+ #else
 diff --git a/newlib/libc/include/sys/_pthreadtypes.h b/newlib/libc/include/sys/_pthreadtypes.h
 index 75e9e1cbf..dc63dbe6a 100644
 --- a/newlib/libc/include/sys/_pthreadtypes.h
@@ -9092,10 +9152,10 @@ index 75e9e1cbf..dc63dbe6a 100644
    int   process_shared;       /* allow this to be shared amongst processes */
  #endif
 diff --git a/newlib/libc/include/sys/_timespec.h b/newlib/libc/include/sys/_timespec.h
-index 7609e4a46..6017a5e3d 100644
+index f810b008f..ca7e11dc7 100644
 --- a/newlib/libc/include/sys/_timespec.h
 +++ b/newlib/libc/include/sys/_timespec.h
-@@ -47,4 +47,10 @@ struct timespec {
+@@ -49,4 +49,10 @@ struct timespec {
  	long	tv_nsec;	/* and nanoseconds */
  };
  
@@ -9107,7 +9167,7 @@ index 7609e4a46..6017a5e3d 100644
 +
  #endif /* !_SYS__TIMESPEC_H_ */
 diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
-index 49b62ebf6..d84ffaa59 100644
+index 61a6f95d8..34aeaad3d 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
 @@ -4,6 +4,9 @@
@@ -9189,10 +9249,10 @@ index a3fb5c02c..b208de4a7 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index f28dd071b..ab3780ee2 100644
+index 45476ce4a..6ed532439 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,16 @@ extern "C" {
+@@ -331,6 +331,16 @@ extern "C" {
  #  define __SSP_FORTIFY_LEVEL 0
  #endif
  
@@ -9342,7 +9402,7 @@ index 000000000..82d2e3576
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/lock.h b/newlib/libc/include/sys/lock.h
-index 528904957..e49f77b75 100644
+index 528904957..2c3e64f1b 100644
 --- a/newlib/libc/include/sys/lock.h
 +++ b/newlib/libc/include/sys/lock.h
 @@ -1,69 +1,105 @@
@@ -9356,7 +9416,7 @@ index 528904957..e49f77b75 100644
 +#include <stdint.h>
  
 -#if !defined(_RETARGETABLE_LOCKING)
-+typedef int32_t _LOCK_T;
++typedef uint32_t _LOCK_T;
  
 -typedef int _LOCK_T;
 -typedef int _LOCK_RECURSIVE_T;
@@ -9501,11 +9561,24 @@ index 528904957..e49f77b75 100644
  
 -#endif /* __SYS_LOCK_H__ */
 +#endif // __SYS_LOCK_H__
+diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
+index 9a6f115a6..fdd6cf92b 100644
+--- a/newlib/libc/include/sys/param.h
++++ b/newlib/libc/include/sys/param.h
+@@ -23,7 +23,7 @@
+ # define PATHSIZE (1024)
+ #endif
+ 
+-#define MAXPATHLEN PATH_MAX
++#define MAXPATHLEN	PATHSIZE
+ 
+ #define MAX(a,b) ((a) > (b) ? (a) : (b))
+ #define MIN(a,b) ((a) < (b) ? (a) : (b))
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 6e55e1c1f..6e0c1c9cf 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
-@@ -416,6 +416,8 @@ struct _reent
+@@ -421,6 +421,8 @@ struct _reent
    __FILE *__sf;			        /* file descriptors */
    struct _misc_reent *_misc;            /* strtok, multibyte states */
    char *_signal_buf;                    /* strsignal */
@@ -9514,7 +9587,7 @@ index 6e55e1c1f..6e0c1c9cf 100644
  };
  
  #ifdef _REENT_GLOBAL_STDIO_STREAMS
-@@ -686,6 +688,7 @@ struct _reent
+@@ -691,6 +693,7 @@ struct _reent
  # ifndef _REENT_GLOBAL_STDIO_STREAMS
    __FILE __sf[3];  		/* first three file descriptors */
  # endif
@@ -9523,10 +9596,10 @@ index 6e55e1c1f..6e0c1c9cf 100644
  
  #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index eee98db64..aed9c1746 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
-@@ -152,8 +152,9 @@ int	mkfifo (const char *__path, mode_t __mode );
+@@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
  int	stat (const char *__restrict __path, struct stat *__restrict __sbuf );
  mode_t	umask (mode_t __mask );
  
@@ -9580,10 +9653,10 @@ index 000000000..380329d34
 +#endif // _SYS_STATVFS_H
 \ No newline at end of file
 diff --git a/newlib/libc/include/sys/syslimits.h b/newlib/libc/include/sys/syslimits.h
-index ba9dbd667..49c213ca8 100644
+index c872d2018..b3800187f 100644
 --- a/newlib/libc/include/sys/syslimits.h
 +++ b/newlib/libc/include/sys/syslimits.h
-@@ -62,4 +62,6 @@
+@@ -58,4 +58,6 @@
  #define	LINE_MAX		 2048	/* max bytes in an input line */
  #define	RE_DUP_MAX		  255	/* max RE's in interval notation */
  
@@ -9617,7 +9690,7 @@ index 5e937f103..635a7a6b8 100644
  };
  #endif
 diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
-index 4c343e462..c04493460 100644
+index 968642745..2ab1f9570 100644
 --- a/newlib/libc/locale/locale.c
 +++ b/newlib/libc/locale/locale.c
 @@ -92,7 +92,7 @@ beginning with <<"LC_">>.
@@ -9729,7 +9802,7 @@ index 4c343e462..c04493460 100644
        if (strcmp (locale, "POSIX") && strcmp (locale, "C")
  	  && strcmp (locale, ""))
          return NULL;
-@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
+@@ -991,6 +1016,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
  
  const char *
  __locale_ctype_ptr (void)
@@ -9766,10 +9839,10 @@ index a0c80843a..efabdcfc4 100644
  
  /* Only access fixed "C" locale using this function.  Fake for !_MB_CAPABLE
 diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
-index e8b8197fa..011f69d69 100644
+index ca7c79074..c5815db9d 100644
 --- a/newlib/libc/machine/aarch64/Makefile.am
 +++ b/newlib/libc/machine/aarch64/Makefile.am
-@@ -9,6 +9,7 @@ AM_CCASFLAGS = $(INCLUDES)
+@@ -7,6 +7,7 @@ AM_CCASFLAGS = $(INCLUDES)
  noinst_LIBRARIES = lib.a
  
  lib_a_SOURCES =
@@ -9778,11 +9851,11 @@ index e8b8197fa..011f69d69 100644
  lib_a_SOURCES += memchr.S
  lib_a_SOURCES += memcmp-stub.c
 diff --git a/newlib/libc/machine/aarch64/Makefile.in b/newlib/libc/machine/aarch64/Makefile.in
-index 39b23a1ce..969512471 100644
+index c854a1b96..3361b0a8c 100644
 --- a/newlib/libc/machine/aarch64/Makefile.in
 +++ b/newlib/libc/machine/aarch64/Makefile.in
-@@ -69,22 +69,22 @@ LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
+@@ -75,22 +75,22 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
  lib_a_AR = $(AR) $(ARFLAGS)
  lib_a_LIBADD =
 -am_lib_a_OBJECTS = lib_a-memchr-stub.$(OBJEXT) lib_a-memchr.$(OBJEXT) \
@@ -9820,7 +9893,7 @@ index 39b23a1ce..969512471 100644
  lib_a_OBJECTS = $(am_lib_a_OBJECTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp =
-@@ -210,7 +210,7 @@ AUTOMAKE_OPTIONS = cygnus
+@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@
  INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
  AM_CCASFLAGS = $(INCLUDES)
  noinst_LIBRARIES = lib.a
@@ -9829,9 +9902,9 @@ index 39b23a1ce..969512471 100644
  	memcpy-stub.c memcpy.S memmove-stub.c memmove.S memset-stub.c \
  	memset.S rawmemchr.S rawmemchr-stub.c setjmp.S stpcpy-stub.c \
  	stpcpy.S strchr-stub.c strchr.S strchrnul-stub.c strchrnul.S \
-@@ -381,6 +381,12 @@ lib_a-strrchr.obj: strrchr.S
+@@ -403,6 +403,12 @@ lib_a-strrchr.obj: strrchr.S
  .c.obj:
- 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 	$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
 +lib_a-access.o: access.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c
@@ -9840,7 +9913,7 @@ index 39b23a1ce..969512471 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi`
 +
  lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
  
 diff --git a/newlib/libc/machine/aarch64/access.c b/newlib/libc/machine/aarch64/access.c
 new file mode 100644
@@ -9882,10 +9955,10 @@ index 000000000..980682ef3
 +}
 +	
 diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
-index 9bd35e733..731130092 100644
+index 2d559464a..1e6625c05 100644
 --- a/newlib/libc/machine/arm/Makefile.am
 +++ b/newlib/libc/machine/arm/Makefile.am
-@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
+@@ -9,7 +9,9 @@ noinst_LIBRARIES = lib.a
  lib_a_SOURCES = setjmp.S strcmp.S strcpy.c \
  		aeabi_memcpy.c aeabi_memcpy-armv7a.S \
  		aeabi_memmove.c aeabi_memmove-soft.S \
@@ -9897,10 +9970,10 @@ index 9bd35e733..731130092 100644
  lib_a_SOURCES += memchr.S
  lib_a_SOURCES += memcpy-stub.c
 diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
-index d9dbcd5c3..43712f813 100644
+index 17a46a44d..b319b8349 100644
 --- a/newlib/libc/machine/arm/Makefile.in
 +++ b/newlib/libc/machine/arm/Makefile.in
-@@ -75,10 +75,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
+@@ -81,10 +81,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
  	lib_a-aeabi_memmove.$(OBJEXT) \
  	lib_a-aeabi_memmove-soft.$(OBJEXT) \
  	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
@@ -9915,7 +9988,7 @@ index d9dbcd5c3..43712f813 100644
  lib_a_OBJECTS = $(am_lib_a_OBJECTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp =
-@@ -208,8 +208,8 @@ noinst_LIBRARIES = lib.a
+@@ -230,8 +230,8 @@ noinst_LIBRARIES = lib.a
  lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
  	aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
  	aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
@@ -9926,9 +9999,9 @@ index d9dbcd5c3..43712f813 100644
  lib_a_CCASFLAGS = $(AM_CCASFLAGS)
  lib_a_CFLAGS = $(AM_CFLAGS)
  ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
-@@ -367,6 +367,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
+@@ -389,6 +389,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
  lib_a-aeabi_memclr.obj: aeabi_memclr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
  
 +lib_a-sync_synchronize.o: sync_synchronize.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
@@ -9937,7 +10010,7 @@ index d9dbcd5c3..43712f813 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
 +
  lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
  
 diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
 new file mode 100644
@@ -10024,7 +10097,7 @@ index 9b982a993..8c0aaac8c 100644
 +*/
  #endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
 diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
-index b358d2b4a..29cec0229 100644
+index df8321461..55ceaab42 100644
 --- a/newlib/libc/stdio/fread.c
 +++ b/newlib/libc/stdio/fread.c
 @@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
@@ -10036,7 +10109,24 @@ index b358d2b4a..29cec0229 100644
  }
  
  #endif
-@@ -225,7 +225,32 @@ _fread_r (struct _reent * ptr,
+@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
+ 	  int rc = 0;
+ 	  /* save fp buffering state */
+ 	  void *old_base = fp->_bf._base;
+-	  void * old_p = fp->_p;
+ 	  int old_size = fp->_bf._size;
+ 	  /* allow __refill to use user's buffer */
+ 	  fp->_bf._base = (unsigned char *) p;
+@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
+ 	  /* restore fp buffering back to original state */
+ 	  fp->_bf._base = old_base;
+ 	  fp->_bf._size = old_size;
+-	  fp->_p = old_p;
++	  fp->_p = old_base;
+ 	  resid -= fp->_r;
+ 	  p += fp->_r;
+ 	  fp->_r = 0;
+@@ -225,7 +224,32 @@ _fread_r (struct _reent * ptr,
  	  /* fp->_r = 0 ... done in __srefill */
  	  p += r;
  	  resid -= r;
@@ -10044,7 +10134,7 @@ index b358d2b4a..29cec0229 100644
 +
 +      int rc = 0;
 +
-+      if (resid>BUFSIZ)
++      if (resid>fp->_bf._size)
 +      {
 +        /* save fp buffering state */
 +        void *old_base = fp->_bf._base;
@@ -10058,7 +10148,7 @@ index b358d2b4a..29cec0229 100644
 +        /* restore fp buffering back to original state */
 +        fp->_bf._base = old_base;
 +        fp->_bf._size = old_size;
-+        fp->_p = old_p;
++        fp->_p = old_base;
 +        resid -= fp->_r;
 +        p += fp->_r;
 +        fp->_r = 0;
@@ -10071,7 +10161,7 @@ index b358d2b4a..29cec0229 100644
  	      /* no more input: return partial result */
  #ifdef __SCLE
 diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
-index 53694aa1c..79a8f4666 100644
+index 84ff40b49..ba1d4ee7b 100644
 --- a/newlib/libc/stdio/local.h
 +++ b/newlib/libc/stdio/local.h
 @@ -56,7 +56,7 @@
@@ -10083,11 +10173,35 @@ index 53694aa1c..79a8f4666 100644
  #define _STDIO_WITH_THREAD_CANCELLATION_SUPPORT
  #endif
  
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
++++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
+ #include <reent.h>
+ #include <stdio.h>
++#include <errno.h>
+ 
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
+ {
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
++  if (_unlink_r (ptr, filename) == -1) {
++    errno = 0;
++    if (_rmdir_r(ptr, filename) == -1)
++      return -1;
++  }
+ 
+   return 0;
+ }
 diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
-index c4bf2dbe3..d756df37d 100644
+index c1483c0ac..319b1972b 100644
 --- a/newlib/libc/stdio/vfprintf.c
 +++ b/newlib/libc/stdio/vfprintf.c
-@@ -112,6 +112,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
+@@ -108,6 +108,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
  */
  
@@ -10096,7 +10210,7 @@ index c4bf2dbe3..d756df37d 100644
  #if defined(LIBC_SCCS) && !defined(lint)
  /*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
  static char *rcsid = "$Id$";
-@@ -1438,7 +1440,7 @@ reswitch:	switch (ch) {
+@@ -1431,7 +1433,7 @@ reswitch:	switch (ch) {
  string:
  #endif
  			sign = '\0';
@@ -10105,7 +10219,7 @@ index c4bf2dbe3..d756df37d 100644
  			/* Behavior is undefined if the user passed a
  			   NULL string when precision is not 0.
  			   However, if we are not optimizing for size,
-@@ -1448,7 +1450,7 @@ string:
+@@ -1441,7 +1443,7 @@ string:
  				size = ((unsigned) prec > 6U) ? 6 : prec;
  			}
  			else
@@ -10115,7 +10229,7 @@ index c4bf2dbe3..d756df37d 100644
  			if (ch == 'S' || (flags & LONGINT)) {
  				mbstate_t ps;
 diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
-index 9c38eebf4..fbc8d877d 100644
+index 037692531..b5e524c53 100644
 --- a/newlib/libc/stdio/vfscanf.c
 +++ b/newlib/libc/stdio/vfscanf.c
 @@ -74,6 +74,8 @@ These are GNU extensions.
@@ -10128,7 +10242,7 @@ index 9c38eebf4..fbc8d877d 100644
  #include <reent.h>
  #include <newlib.h>
 diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
-index 980b31e3b..722be905e 100644
+index 7384b37d3..b4e1dbde5 100644
 --- a/newlib/libc/stdio/vfwprintf.c
 +++ b/newlib/libc/stdio/vfwprintf.c
 @@ -92,6 +92,9 @@ SEEALSO
@@ -10142,7 +10256,7 @@ index 980b31e3b..722be905e 100644
  
  #ifdef INTEGER_ONLY
 diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
-index 0464b0837..435fc0142 100644
+index e9e00dfec..c38d81e17 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
 @@ -74,6 +74,9 @@ PORTABILITY
@@ -10156,10 +10270,10 @@ index 0464b0837..435fc0142 100644
  #include <reent.h>
  #include <newlib.h>
 diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
-index 357e37beb..7183b2100 100644
+index a91bdc784..e049adc9a 100644
 --- a/newlib/libc/stdlib/Makefile.am
 +++ b/newlib/libc/stdlib/Makefile.am
-@@ -110,6 +110,7 @@ MALLOCR=mallocr
+@@ -112,6 +112,7 @@ MALLOCR=mallocr
  endif
  
  EXTENDED_SOURCES = \
@@ -10168,10 +10282,10 @@ index 357e37beb..7183b2100 100644
  	arc4random_uniform.c \
  	cxa_atexit.c	\
 diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
-index 699831f13..1e6d2e612 100644
+index 0fed51d79..2d8dc1325 100644
 --- a/newlib/libc/stdlib/Makefile.in
 +++ b/newlib/libc/stdlib/Makefile.in
-@@ -119,7 +119,7 @@ am__objects_2 = lib_a-__adjust.$(OBJEXT) lib_a-__atexit.$(OBJEXT) \
+@@ -127,7 +127,7 @@ am__objects_2 = lib_a-__adjust.$(OBJEXT) lib_a-__atexit.$(OBJEXT) \
  	lib_a-wcstoumax.$(OBJEXT) lib_a-wcstombs.$(OBJEXT) \
  	lib_a-wcstombs_r.$(OBJEXT) lib_a-wctomb.$(OBJEXT) \
  	lib_a-wctomb_r.$(OBJEXT) $(am__objects_1)
@@ -10180,7 +10294,7 @@ index 699831f13..1e6d2e612 100644
  	lib_a-arc4random_uniform.$(OBJEXT) lib_a-cxa_atexit.$(OBJEXT) \
  	lib_a-cxa_finalize.$(OBJEXT) lib_a-drand48.$(OBJEXT) \
  	lib_a-ecvtbuf.$(OBJEXT) lib_a-efgcvt.$(OBJEXT) \
-@@ -173,7 +173,7 @@ am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
+@@ -182,7 +182,7 @@ am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
  	utoa.lo wcstod.lo wcstoimax.lo wcstol.lo wcstoul.lo \
  	wcstoumax.lo wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \
  	$(am__objects_8)
@@ -10189,9 +10303,9 @@ index 699831f13..1e6d2e612 100644
  	cxa_finalize.lo drand48.lo ecvtbuf.lo efgcvt.lo erand48.lo \
  	jrand48.lo lcong48.lo lrand48.lo mrand48.lo msize.lo mtrim.lo \
  	nrand48.lo rand48.lo seed48.lo srand48.lo strtoll.lo \
-@@ -1054,6 +1054,12 @@ lib_a-wcstold.o: wcstold.c
+@@ -1102,6 +1102,12 @@ lib_a-wcstold.o: wcstold.c
  lib_a-wcstold.obj: wcstold.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wcstold.obj `if test -f 'wcstold.c'; then $(CYGPATH_W) 'wcstold.c'; else $(CYGPATH_W) '$(srcdir)/wcstold.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wcstold.obj `if test -f 'wcstold.c'; then $(CYGPATH_W) 'wcstold.c'; else $(CYGPATH_W) '$(srcdir)/wcstold.c'; fi`
  
 +lib_a-threads.o: threads.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-threads.o `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
@@ -10200,40 +10314,8 @@ index 699831f13..1e6d2e612 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-threads.obj `if test -f 'threads.c'; then $(CYGPATH_W) 'threads.c'; else $(CYGPATH_W) '$(srcdir)/threads.c'; fi`
 +
  lib_a-arc4random.o: arc4random.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-arc4random.o `test -f 'arc4random.c' || echo '$(srcdir)/'`arc4random.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-arc4random.o `test -f 'arc4random.c' || echo '$(srcdir)/'`arc4random.c
  
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index 88413ce86..24029a6f7 100644
---- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2015 embedded brains GmbH
-+ * Copyright (c) 2018 Dave Murphy
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -25,14 +25,15 @@
-  */
- 
- #include <stdlib.h>
-+#include <malloc.h>
-+#include <errno.h>
- 
- void *
- aligned_alloc(size_t alignment, size_t size)
- {
--	void *p;
--	int error;
-+	if ((alignment !=0) && !(alignment & (alignment - 1 )) && !(size & (alignment - 1)))
-+		return memalign(alignment,size);
- 
--	error = posix_memalign(&p, alignment, size);
--
--	return (error == 0 ? p : NULL);
-+	errno = EINVAL;
-+	return (void*)NULL;
- }
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644
 --- a/newlib/libc/stdlib/mbtowc_r.c
@@ -10573,16 +10655,3 @@ index 000000000..567fed56b
 +	__libc_lock_release_recursive(&(NAME))
 +
 +#endif // __SYS_LOCK_H__
-diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h
-index 5b9464cca..e8969b954 100644
---- a/newlib/libc/sys/arm/sys/param.h
-+++ b/newlib/libc/sys/arm/sys/param.h
-@@ -19,6 +19,8 @@
- # define PATHSIZE (1024)
- #endif
- 
-+#define MAXPATHLEN	PATHSIZE
-+
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- 

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,21 +49,23 @@ 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 \
 		--enable-libstdcxx-time \
 		--enable-libstdcxx-filesystem-ts \
 		--target=$target \
-		--with-newlib \
+		--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 14" \
+		--enable-lto \
+		--disable-tm-clone-registry \
+		--disable-__cxa_atexit \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 19" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+		$EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -148,42 +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
-	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-12.2.0.patch

@@ -1,8 +1,7 @@
-diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 3a55f6ac6d2..1a16dcc1c74 100644
---- a/gcc/config/arm/arm-cpus.in
-+++ b/gcc/config/arm/arm-cpus.in
-@@ -352,7 +352,7 @@ begin arch armv6k
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in	2022-04-30 13:31:09.120134164 +0100
+@@ -412,7 +412,7 @@
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -11,17 +10,16 @@ index 3a55f6ac6d2..1a16dcc1c74 100644
   option fp add VFPv2 FP_DBL
   optalias vfpv2 fp
   option nofp remove ALL_FP
-diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
-index 8911d489f14..b1976386bab 100644
---- a/gcc/config/arm/t-arm-elf
-+++ b/gcc/config/arm/t-arm-elf
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf	2022-04-30 13:31:39.759455398 +0100
 @@ -1,4 +1,4 @@
--# Copyright (C) 1998-2019 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
+-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
++# Copyright (C) 1998-2021 Free Software Foundation, Inc.
  #
  # This file is part of GCC.
  #
-@@ -16,111 +16,14 @@
+@@ -16,120 +16,14 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
  
@@ -47,6 +45,8 @@ index 8911d489f14..b1976386bab 100644
 -# it seems to work ok.
 -v8_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
 -
+-v9_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
+-
 -# We don't do anything special with these.  Pre-v4t probably doesn't work.
 -all_early_nofp	:= armv4 armv4t armv5t
 -
@@ -56,7 +56,9 @@ index 8911d489f14..b1976386bab 100644
 -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.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
@@ -115,11 +117,16 @@ index 8911d489f14..b1976386bab 100644
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
- 
+-
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
+ 
+-MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
+-			  march?armv7+fp=march?$(ARCH) \
+-			  $(foreach FPARCH, $(v9_fps), \
+-			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
 +MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
  
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
@@ -138,10 +145,9 @@ index 8911d489f14..b1976386bab 100644
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
-diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index cf9ba6b4dc0..008d7555ecb 100644
---- a/gcc/config/arm/unknown-elf.h
-+++ b/gcc/config/arm/unknown-elf.h
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h	2022-04-30 13:31:09.120134164 +0100
 @@ -29,7 +29,7 @@
  #endif
  
@@ -158,11 +164,25 @@ index cf9ba6b4dc0..008d7555ecb 100644
 -#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
 +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
 +
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4f57765b012..2899202cc05 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -794,6 +794,11 @@ proper position among the other output files.  */
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc	2022-04-30 13:31:09.120134164 +0100
+@@ -45,7 +45,11 @@
+ 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 -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc	2022-04-30 13:31:09.120134164 +0100
+@@ -860,6 +860,11 @@
  #endif
  #endif
  
@@ -174,7 +194,7 @@ index 4f57765b012..2899202cc05 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1204,6 +1209,7 @@
  static const char *lib_spec = LIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -182,7 +202,7 @@ index 4f57765b012..2899202cc05 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] =
+@@ -1709,6 +1715,7 @@
    INIT_STATIC_SPEC ("lib",			&lib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -190,26 +210,24 @@ index 4f57765b012..2899202cc05 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
-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
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi
+--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi	2022-04-29 14:58:25.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi	2022-04-30 13:31:09.120134164 +0100
+@@ -17,4 +17,4 @@
  # On ARM, specifying -fnon-call-exceptions will needlessly pull in
  # the unwinder in simple programs which use 64-bit division.  Omitting
  # the option is safe.
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 4927a9f8977..2a79e3e137d 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
++++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c	2022-04-30 13:31:09.120134164 +0100
+@@ -325,7 +325,7 @@
  
- /* Target machine header files require this define. */
- #define IN_LIBGCC2
--
-+#define USED_FOR_TARGET
- /* FIXME: Including auto-host is incorrect, but until we have
-    identified the set of defines that need to go into auto-target.h,
-    this will have to do.  */
+ #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

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/patches/newlib-4.2.0.20211231.patch

@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 1a4033dce..ba7aea7b0 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
  
  fi
  
@@ -11,19 +11,19 @@ index 1a4033dce..ba7aea7b0 100755
  DEPDIR="${am__leading_dot}deps"
  
  ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 41843eed1..dc0e2a5fd 100644
---- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..577dfdec6 100644
+--- a/libgloss/configure.ac
++++ b/libgloss/configure.ac
 @@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
  AC_INIT([libgloss],[LIBGLOSS_VERSION])
  AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
  
  if test "${enable_shared}" = "yes" ; then
      echo "Shared libraries not supported for cross compiling, ignored"
-@@ -190,6 +191,7 @@ dnl fi
+@@ -196,6 +197,7 @@ dnl fi
  if test "${config_libnosys}" = "true"; then
    AC_CONFIG_SUBDIRS([libnosys])
  fi
@@ -33,7 +33,7 @@ index 41843eed1..dc0e2a5fd 100644
  AS=${AS-as}
 diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
 new file mode 100644
-index 000000000..7ee40deec
+index 000000000..edb10d215
 --- /dev/null
 +++ b/libgloss/libsysbase/Makefile.in
 @@ -0,0 +1,148 @@
@@ -108,8 +108,8 @@ index 000000000..7ee40deec
 +	isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
 +	unlink.o wait.o write.o _exit.o malloc_vars.o \
 +	chdir.o mkdir.o rename.o build_argv.o statvfs.o \
-+	flock.o syscall_support.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
-+	fchmod.o chmod.o getreent.o rmdir.o utime.o scandir.o
++	flock.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
++	fchmod.o chmod.o getreent.o rmdir.o utime.o scandir.o syscall_support.o
 +
 +# Object files specific to particular targets.
 +EVALOBJS = ${OBJS}
@@ -130,10 +130,10 @@ index 000000000..7ee40deec
 +AR_FLAGS = qc
 +
 +.c.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
++	$(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
 +
 +.C.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
++	$(CC) $(CFLAGS_FOR_TARGET) -O2 -D_BUILDING_LIBSYSBASE $(INCLUDES) -c $(CFLAGS) $<
 +.s.o:
 +	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
 +
@@ -187,7 +187,7 @@ index 000000000..7ee40deec
 +	$(SHELL) config.status --recheck
 diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
 new file mode 100644
-index 000000000..e5cb5a9ed
+index 000000000..6effb1105
 --- /dev/null
 +++ b/libgloss/libsysbase/_exit.c
 @@ -0,0 +1,17 @@
@@ -202,8 +202,8 @@ index 000000000..e5cb5a9ed
 +void _exit(int rc)
 +{
 +
-+	if ( __syscalls.exit ) {
-+		__syscalls.exit(rc);
++	if ( __has_syscall(exit) ) {
++		__syscall_exit(rc);
 +	}
 +
 +	while(1);
@@ -889,7 +889,7 @@ index 000000000..3668b5801
 +
 diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
 new file mode 100644
-index 000000000..01cfee469
+index 000000000..b36b5c079
 --- /dev/null
 +++ b/libgloss/libsysbase/clocks.c
 @@ -0,0 +1,34 @@
@@ -899,8 +899,8 @@ index 000000000..01cfee469
 +
 +int clock_gettime(clockid_t clock_id, struct timespec *tp)
 +{
-+   if ( __syscalls.clock_gettime ) {
-+      return __syscalls.clock_gettime(clock_id, tp);
++   if ( __has_syscall(clock_gettime) ) {
++      return __syscall_clock_gettime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -909,8 +909,8 @@ index 000000000..01cfee469
 +
 +int clock_settime(clockid_t clock_id, const struct timespec *tp)
 +{
-+   if ( __syscalls.clock_settime ) {
-+      return __syscalls.clock_settime(clock_id, tp);
++   if ( __has_syscall(clock_settime) ) {
++      return __syscall_clock_settime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -919,8 +919,8 @@ index 000000000..01cfee469
 +
 +int clock_getres (clockid_t clock_id, struct timespec *res)
 +{
-+   if ( __syscalls.clock_getres ) {
-+      return __syscalls.clock_getres(clock_id, res);
++   if ( __has_syscall(clock_getres) ) {
++      return __syscall_clock_getres(clock_id, res);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -5884,7 +5884,7 @@ index 000000000..fdce14b5f
 +
 diff --git a/libgloss/libsysbase/getreent.c b/libgloss/libsysbase/getreent.c
 new file mode 100644
-index 000000000..028d0eb77
+index 000000000..a3f1e98a9
 --- /dev/null
 +++ b/libgloss/libsysbase/getreent.c
 @@ -0,0 +1,20 @@
@@ -5900,8 +5900,8 @@ index 000000000..028d0eb77
 +#endif
 +
 +struct _reent *__getreent() {
-+	if ( __syscalls.getreent ) {
-+		return __syscalls.getreent();
++	if ( __has_syscall(getreent) ) {
++		return __syscall_getreent();
 +	} else {
 +		return _impure_ptr;
 +	}
@@ -5910,7 +5910,7 @@ index 000000000..028d0eb77
 +
 diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
 new file mode 100644
-index 000000000..9d5b74724
+index 000000000..4f2211248
 --- /dev/null
 +++ b/libgloss/libsysbase/gettod.c
 @@ -0,0 +1,33 @@
@@ -5940,7 +5940,7 @@ index 000000000..9d5b74724
 +	struct _reent *ptr = _REENT;
 +#endif
 +
-+	if ( __syscalls.gettod_r ) return __syscalls.gettod_r(ptr, ptimeval, ptimezone);
++	if ( __has_syscall(gettod_r) ) return __syscall_gettod_r(ptr, ptimeval, ptimezone);
 +
 +	ptr->_errno = ENOSYS;
 +	return -1;
@@ -6540,7 +6540,7 @@ index 000000000..b4fcbd3d7
 +}
 diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
 new file mode 100644
-index 000000000..3c96fc61b
+index 000000000..a233b9df6
 --- /dev/null
 +++ b/libgloss/libsysbase/nanosleep.c
 @@ -0,0 +1,14 @@
@@ -6550,8 +6550,8 @@ index 000000000..3c96fc61b
 +
 +int nanosleep(const struct timespec *req, struct timespec *rem)
 +{
-+   if ( __syscalls.nanosleep ) {
-+      return __syscalls.nanosleep(req, rem);
++   if ( __has_syscall(nanosleep) ) {
++      return __syscall_nanosleep(req, rem);
 +   } else {
 +      *rem = *req;
 +      errno = ENOSYS;
@@ -6704,10 +6704,10 @@ index 000000000..97a056a72
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -6715,24 +6715,33 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
++int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
++			ptr->deviceData = devoptab_list[dev]->deviceData;
++			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
++			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
++		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
++
++#ifndef _REENT_ONLY
++
++int
++rmdir (const char *filename)
++{
++  return _rmdir_r (_REENT, filename);
++}
++
++#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
 index 000000000..5dd550c5c
@@ -6979,54 +6988,30 @@ index 000000000..84e221340
 +}
 diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
 new file mode 100644
-index 000000000..53fead72a
+index 000000000..9bb71aa0d
 --- /dev/null
 +++ b/libgloss/libsysbase/syscall_support.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,78 @@
 +#include <sys/iosupport.h>
 +
-+//---------------------------------------------------------------------------------
-+__syscalls_t __syscalls = {
-+//---------------------------------------------------------------------------------
-+	NULL,	// sbrk
-+	NULL,	// exit
-+	NULL,	// gettod_r
-+	NULL,	// lock_init
-+	NULL,	// lock_acquire
-+	NULL,	// lock_try_acquire
-+	NULL,	// lock_release
-+	NULL,	// lock_close
-+	NULL,	// lock_init_recursive
-+	NULL,	// lock_acquire_recursive
-+	NULL,	// lock_try_acquire_recursive
-+	NULL,	// lock_release_recursive
-+	NULL,	// lock_close_recursive
-+	NULL,	// __getreent
-+	NULL,	// clock_gettime
-+	NULL,	// clock_settime
-+	NULL,	// clock_getres
-+	NULL,	// nanosleep
-+};
-+
 +void __libc_lock_init(_LOCK_T *lock) {
 +
-+	if ( __syscalls.lock_init ) {
-+		__syscalls.lock_init(lock);
++	if ( __has_syscall(lock_init) ) {
++		__syscall_lock_init(lock);
 +	}
-+
 +}
 +
 +void __libc_lock_acquire(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire) {
-+		__syscalls.lock_acquire(lock);
++	if ( __has_syscall(lock_acquire) ) {
++		__syscall_lock_acquire(lock);
 +	}
 +}
 +
 +int __libc_lock_try_acquire(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire) {
-+		return __syscalls.lock_try_acquire(lock);
++	if ( __has_syscall(lock_acquire) ) {
++		return __syscall_lock_try_acquire(lock);
 +	} else {
 +		return 0;
 +	}
@@ -7034,15 +7019,15 @@ index 000000000..53fead72a
 +
 +void __libc_lock_release(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_release) {
-+		__syscalls.lock_release(lock);
++	if ( __has_syscall(lock_release) ) {
++		__syscall_lock_release(lock);
 +	}
 +}
 +
 +void __libc_lock_close(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_close) {
-+		__syscalls.lock_close(lock);
++	if ( __has_syscall(lock_close) ) {
++		__syscall_lock_close(lock);
 +	}
 +}
 +
@@ -7050,23 +7035,23 @@ index 000000000..53fead72a
 +
 +void __libc_lock_init_recursive(_LOCK_RECURSIVE_T *lock) {
 +
-+	if ( __syscalls.lock_init_recursive ) {
-+		__syscalls.lock_init_recursive(lock);
++	if ( __has_syscall(lock_init_recursive) ) {
++		__syscall_lock_init_recursive(lock);
 +	}
 +
 +}
 +
 +void __libc_lock_acquire_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire_recursive) {
-+		__syscalls.lock_acquire_recursive(lock);
++	if ( __has_syscall(lock_acquire_recursive) ) {
++		__syscall_lock_acquire_recursive(lock);
 +	}
 +}
 +
 +int __libc_lock_try_acquire_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire_recursive) {
-+		return __syscalls.lock_try_acquire_recursive(lock);
++	if ( __has_syscall(lock_acquire_recursive) ) {
++		return __syscall_lock_try_acquire_recursive(lock);
 +	} else {
 +		return 0;
 +	}
@@ -7074,18 +7059,17 @@ index 000000000..53fead72a
 +
 +void __libc_lock_release_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_release_recursive) {
-+		__syscalls.lock_release_recursive(lock);
++	if ( __has_syscall(lock_release_recursive) ) {
++		__syscall_lock_release_recursive(lock);
 +	}
 +}
 +
 +void __libc_lock_close_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_close_recursive) {
-+		__syscalls.lock_close_recursive(lock);
++	if ( __has_syscall(lock_close_recursive) ) {
++		__syscall_lock_close_recursive(lock);
 +	}
 +}
-+
 diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
 new file mode 100644
 index 000000000..79484e7f4
@@ -7408,10 +7392,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 6c49cb750..6a5e1c78d 100644
+index c429dde1c..26fb553a7 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -666,6 +666,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -693,6 +693,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
  	syscall_dir=syscalls
  	default_newlib_io_long_long="yes"
  	;;
@@ -7426,8 +7410,46 @@ index 6c49cb750..6a5e1c78d 100644
    arm*-*-pe)
  	syscall_dir=syscalls
  	;;
+diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
+index 5e30f09be..1ea357f92 100644
+--- a/newlib/libc/ctype/jp2uc.c
++++ b/newlib/libc/ctype/jp2uc.c
+@@ -35,7 +35,7 @@
+ #ifdef _MB_CAPABLE
+ /* Under Cygwin, the incoming wide character is already given in UTF due
+    to the requirements of the underlying OS. */
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__DEVKITA64__)
+ 
+ #include <_ansi.h>
+ #include <string.h>
+diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
+index 5c293c83d..75ccf89f5 100644
+--- a/newlib/libc/ctype/local.h
++++ b/newlib/libc/ctype/local.h
+@@ -32,7 +32,7 @@
+    * for towupper and towlower, the result must be back-transformed
+      into the respective locale encoding; currently NOT IMPLEMENTED
+ */
+-#ifdef __CYGWIN__
++#if defined(__CYGWIN__) || defined(__DEVKITA64__)
+ /* Under Cygwin, wchar_t (or its extension wint_t) is Unicode */
+ #define _jp2uc(c) (c)
+ #define _jp2uc_l(c, l) (c)
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
++++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
++extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
-index 164d95bca..083e48758 100644
+index 7748351f0..7377b2aa3 100644
 --- a/newlib/libc/include/stdio.h
 +++ b/newlib/libc/include/stdio.h
 @@ -233,7 +233,7 @@ int	fsetpos (FILE *, const _fpos_t *);
@@ -7440,7 +7462,7 @@ index 164d95bca..083e48758 100644
  void	clearerr (FILE *);
  int	feof (FILE *);
 diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
-index 49b62ebf6..d84ffaa59 100644
+index 61a6f95d8..34aeaad3d 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
 @@ -4,6 +4,9 @@
@@ -7520,10 +7542,10 @@ index a3fb5c02c..5debd1525 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index f28dd071b..96980676d 100644
+index 45476ce4a..d76706321 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,9 @@ extern "C" {
+@@ -331,6 +331,9 @@ extern "C" {
  #  define __SSP_FORTIFY_LEVEL 0
  #endif
  
@@ -7535,10 +7557,10 @@ index f28dd071b..96980676d 100644
  #ifdef __rtems__
 diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
 new file mode 100644
-index 000000000..c190fa37d
+index 000000000..7b366f593
 --- /dev/null
 +++ b/newlib/libc/include/sys/iosupport.h
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,115 @@
 +//---------------------------------------------------------------------------------
 +#ifndef __iosupp_h__
 +#define __iosupp_h__
@@ -7611,28 +7633,31 @@ index 000000000..c190fa37d
 +
 +extern const devoptab_t *devoptab_list[];
 +
-+typedef struct {
-+	void *(*sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
-+	void (*exit) ( int rc );
-+	int  (*gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
-+	void (*lock_init) (_LOCK_T *lock);
-+	void (*lock_acquire) (_LOCK_T *lock);
-+	int  (*lock_try_acquire) (_LOCK_T *lock);
-+	void (*lock_release) (_LOCK_T *lock);
-+	void (*lock_close) (_LOCK_T *lock);
-+	void (*lock_init_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
-+	int  (*lock_try_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_release_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_close_recursive) (_LOCK_RECURSIVE_T *lock);
-+	struct _reent *(*getreent) ();
-+	int (*clock_gettime)(clockid_t clock_id, struct timespec *tp);
-+	int (*clock_settime)(clockid_t clock_id, const struct timespec *tp);
-+	int (*clock_getres)(clockid_t clock_id, struct timespec *res);
-+	int (*nanosleep)(const struct timespec *req, struct timespec *rem);
-+} __syscalls_t;
++#ifdef _BUILDING_LIBSYSBASE
++#define __SYSCALL(_name) __attribute__((weak)) __syscall_##_name
++#define __has_syscall(_name) (&__syscall_##_name)
++#else
++#define __SYSCALL(_name) __syscall_##_name
++#endif
 +
-+extern __syscalls_t __syscalls;
++void *__SYSCALL(sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
++void __SYSCALL(exit) ( int rc );
++int  __SYSCALL(gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
++void __SYSCALL(lock_init) (_LOCK_T *lock);
++void __SYSCALL(lock_acquire) (_LOCK_T *lock);
++int  __SYSCALL(lock_try_acquire) (_LOCK_T *lock);
++void __SYSCALL(lock_release) (_LOCK_T *lock);
++void __SYSCALL(lock_close) (_LOCK_T *lock);
++void __SYSCALL(lock_init_recursive) (_LOCK_RECURSIVE_T *lock);
++void __SYSCALL(lock_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
++int  __SYSCALL(lock_try_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
++void __SYSCALL(lock_release_recursive) (_LOCK_RECURSIVE_T *lock);
++void __SYSCALL(lock_close_recursive) (_LOCK_RECURSIVE_T *lock);
++struct _reent * __SYSCALL(getreent) ();
++int __SYSCALL(clock_gettime) (clockid_t clock_id, struct timespec *tp);
++int __SYSCALL(clock_settime) (clockid_t clock_id, const struct timespec *tp);
++int __SYSCALL(clock_getres) (clockid_t clock_id, struct timespec *res);
++int __SYSCALL(nanosleep) (const struct timespec *req, struct timespec *rem);
 +
 +int AddDevice( const devoptab_t* device);
 +int FindDevice(const char* name);
@@ -7651,11 +7676,25 @@ index 000000000..c190fa37d
 +//---------------------------------------------------------------------------------
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
+diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
+index 9a6f115a6..142e71d35 100644
+--- a/newlib/libc/include/sys/param.h
++++ b/newlib/libc/include/sys/param.h
+@@ -19,9 +19,6 @@
+ #ifndef NOFILE
+ # define NOFILE	(60)
+ #endif
+-#ifndef PATHSIZE
+-# define PATHSIZE (1024)
+-#endif
+ 
+ #define MAXPATHLEN PATH_MAX
+ 
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 6e55e1c1f..6e0c1c9cf 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
-@@ -416,6 +416,8 @@ struct _reent
+@@ -421,6 +421,8 @@ struct _reent
    __FILE *__sf;			        /* file descriptors */
    struct _misc_reent *_misc;            /* strtok, multibyte states */
    char *_signal_buf;                    /* strsignal */
@@ -7664,7 +7703,7 @@ index 6e55e1c1f..6e0c1c9cf 100644
  };
  
  #ifdef _REENT_GLOBAL_STDIO_STREAMS
-@@ -686,6 +688,7 @@ struct _reent
+@@ -691,6 +693,7 @@ struct _reent
  # ifndef _REENT_GLOBAL_STDIO_STREAMS
    __FILE __sf[3];  		/* first three file descriptors */
  # endif
@@ -7673,10 +7712,10 @@ index 6e55e1c1f..6e0c1c9cf 100644
  
  #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index eee98db64..aed9c1746 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
-@@ -152,8 +152,9 @@ int	mkfifo (const char *__path, mode_t __mode );
+@@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
  int	stat (const char *__restrict __path, struct stat *__restrict __sbuf );
  mode_t	umask (mode_t __mask );
  
@@ -7756,7 +7795,7 @@ index 5e937f103..635a7a6b8 100644
  };
  #endif
 diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
-index 4c343e462..c04493460 100644
+index 968642745..2ab1f9570 100644
 --- a/newlib/libc/locale/locale.c
 +++ b/newlib/libc/locale/locale.c
 @@ -92,7 +92,7 @@ beginning with <<"LC_">>.
@@ -7868,7 +7907,7 @@ index 4c343e462..c04493460 100644
        if (strcmp (locale, "POSIX") && strcmp (locale, "C")
  	  && strcmp (locale, ""))
          return NULL;
-@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
+@@ -991,6 +1016,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
  
  const char *
  __locale_ctype_ptr (void)
@@ -7877,10 +7916,10 @@ index 4c343e462..c04493460 100644
    return __get_current_locale ()->ctype_ptr;
  }
 diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
-index 9bd35e733..731130092 100644
+index 2d559464a..1e6625c05 100644
 --- a/newlib/libc/machine/arm/Makefile.am
 +++ b/newlib/libc/machine/arm/Makefile.am
-@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
+@@ -9,7 +9,9 @@ noinst_LIBRARIES = lib.a
  lib_a_SOURCES = setjmp.S strcmp.S strcpy.c \
  		aeabi_memcpy.c aeabi_memcpy-armv7a.S \
  		aeabi_memmove.c aeabi_memmove-soft.S \
@@ -7892,10 +7931,10 @@ index 9bd35e733..731130092 100644
  lib_a_SOURCES += memchr.S
  lib_a_SOURCES += memcpy-stub.c
 diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
-index d9dbcd5c3..43712f813 100644
+index 17a46a44d..b319b8349 100644
 --- a/newlib/libc/machine/arm/Makefile.in
 +++ b/newlib/libc/machine/arm/Makefile.in
-@@ -75,10 +75,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
+@@ -81,10 +81,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
  	lib_a-aeabi_memmove.$(OBJEXT) \
  	lib_a-aeabi_memmove-soft.$(OBJEXT) \
  	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
@@ -7910,7 +7949,7 @@ index d9dbcd5c3..43712f813 100644
  lib_a_OBJECTS = $(am_lib_a_OBJECTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp =
-@@ -208,8 +208,8 @@ noinst_LIBRARIES = lib.a
+@@ -230,8 +230,8 @@ noinst_LIBRARIES = lib.a
  lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
  	aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
  	aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
@@ -7921,9 +7960,9 @@ index d9dbcd5c3..43712f813 100644
  lib_a_CCASFLAGS = $(AM_CCASFLAGS)
  lib_a_CFLAGS = $(AM_CFLAGS)
  ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
-@@ -367,6 +367,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
+@@ -389,6 +389,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
  lib_a-aeabi_memclr.obj: aeabi_memclr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
  
 +lib_a-sync_synchronize.o: sync_synchronize.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
@@ -7932,7 +7971,7 @@ index d9dbcd5c3..43712f813 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
 +
  lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
  
 diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
 new file mode 100644
@@ -8017,7 +8056,7 @@ index 9b982a993..8c0aaac8c 100644
 +*/
  #endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
 diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
-index b358d2b4a..29cec0229 100644
+index df8321461..9263e5829 100644
 --- a/newlib/libc/stdio/fread.c
 +++ b/newlib/libc/stdio/fread.c
 @@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
@@ -8029,7 +8068,24 @@ index b358d2b4a..29cec0229 100644
  }
  
  #endif
-@@ -225,7 +225,32 @@ _fread_r (struct _reent * ptr,
+@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
+ 	  int rc = 0;
+ 	  /* save fp buffering state */
+ 	  void *old_base = fp->_bf._base;
+-	  void * old_p = fp->_p;
+ 	  int old_size = fp->_bf._size;
+ 	  /* allow __refill to use user's buffer */
+ 	  fp->_bf._base = (unsigned char *) p;
+@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
+ 	  /* restore fp buffering back to original state */
+ 	  fp->_bf._base = old_base;
+ 	  fp->_bf._size = old_size;
+-	  fp->_p = old_p;
++	  fp->_p = old_base;
+ 	  resid -= fp->_r;
+ 	  p += fp->_r;
+ 	  fp->_r = 0;
+@@ -225,7 +224,30 @@ _fread_r (struct _reent * ptr,
  	  /* fp->_r = 0 ... done in __srefill */
  	  p += r;
  	  resid -= r;
@@ -8037,37 +8093,59 @@ index b358d2b4a..29cec0229 100644
 +
 +      int rc = 0;
 +
-+      if (resid>BUFSIZ)
++      if (resid>fp->_bf._size)
 +      {
 +        /* save fp buffering state */
 +        void *old_base = fp->_bf._base;
-+        void * old_p = fp->_p;
 +        int old_size = fp->_bf._size;
 +        /* allow __refill to use user's buffer */
 +        fp->_bf._base = (unsigned char *) p;
-+        fp->_bf._size = resid;
++        fp->_bf._size = resid - old_size;
 +        fp->_p = (unsigned char *) p;
 +        rc = __srefill_r (ptr, fp);
 +        /* restore fp buffering back to original state */
 +        fp->_bf._base = old_base;
 +        fp->_bf._size = old_size;
-+        fp->_p = old_p;
++        fp->_p = old_base;
 +        resid -= fp->_r;
 +        p += fp->_r;
-+        fp->_r = 0;
-+
-+      } else {
-+        rc = __srefill_r (ptr, fp);
++        //fp->_r = 0;
 +      }
++        rc = __srefill_r (ptr, fp);
++
 +	  if (rc)
  	    {
  	      /* no more input: return partial result */
  #ifdef __SCLE
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
++++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
+ #include <reent.h>
+ #include <stdio.h>
++#include <errno.h>
+ 
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
+ {
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
++  if (_unlink_r (ptr, filename) == -1) {
++    errno = 0;
++    if (_rmdir_r(ptr, filename) == -1)
++      return -1;
++  }
+ 
+   return 0;
+ }
 diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
-index c4bf2dbe3..d756df37d 100644
+index c1483c0ac..319b1972b 100644
 --- a/newlib/libc/stdio/vfprintf.c
 +++ b/newlib/libc/stdio/vfprintf.c
-@@ -112,6 +112,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
+@@ -108,6 +108,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
  */
  
@@ -8076,7 +8154,7 @@ index c4bf2dbe3..d756df37d 100644
  #if defined(LIBC_SCCS) && !defined(lint)
  /*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
  static char *rcsid = "$Id$";
-@@ -1438,7 +1440,7 @@ reswitch:	switch (ch) {
+@@ -1431,7 +1433,7 @@ reswitch:	switch (ch) {
  string:
  #endif
  			sign = '\0';
@@ -8085,7 +8163,7 @@ index c4bf2dbe3..d756df37d 100644
  			/* Behavior is undefined if the user passed a
  			   NULL string when precision is not 0.
  			   However, if we are not optimizing for size,
-@@ -1448,7 +1450,7 @@ string:
+@@ -1441,7 +1443,7 @@ string:
  				size = ((unsigned) prec > 6U) ? 6 : prec;
  			}
  			else
@@ -8095,7 +8173,7 @@ index c4bf2dbe3..d756df37d 100644
  			if (ch == 'S' || (flags & LONGINT)) {
  				mbstate_t ps;
 diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
-index 9c38eebf4..fbc8d877d 100644
+index 037692531..b5e524c53 100644
 --- a/newlib/libc/stdio/vfscanf.c
 +++ b/newlib/libc/stdio/vfscanf.c
 @@ -74,6 +74,8 @@ These are GNU extensions.
@@ -8108,7 +8186,7 @@ index 9c38eebf4..fbc8d877d 100644
  #include <reent.h>
  #include <newlib.h>
 diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
-index 980b31e3b..722be905e 100644
+index 7384b37d3..b4e1dbde5 100644
 --- a/newlib/libc/stdio/vfwprintf.c
 +++ b/newlib/libc/stdio/vfwprintf.c
 @@ -92,6 +92,9 @@ SEEALSO
@@ -8122,7 +8200,7 @@ index 980b31e3b..722be905e 100644
  
  #ifdef INTEGER_ONLY
 diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
-index 0464b0837..435fc0142 100644
+index e9e00dfec..c38d81e17 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
 @@ -74,6 +74,9 @@ PORTABILITY
@@ -8135,38 +8213,6 @@ index 0464b0837..435fc0142 100644
  #include <_ansi.h>
  #include <reent.h>
  #include <newlib.h>
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index 88413ce86..24029a6f7 100644
---- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2015 embedded brains GmbH
-+ * Copyright (c) 2018 Dave Murphy
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -25,14 +25,15 @@
-  */
- 
- #include <stdlib.h>
-+#include <malloc.h>
-+#include <errno.h>
- 
- void *
- aligned_alloc(size_t alignment, size_t size)
- {
--	void *p;
--	int error;
-+	if ((alignment !=0) && !(alignment & (alignment - 1 )) && !(size & (alignment - 1)))
-+		return memalign(alignment,size);
- 
--	error = posix_memalign(&p, alignment, size);
--
--	return (error == 0 ? p : NULL);
-+	errno = EINVAL;
-+	return (void*)NULL;
- }
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644
 --- a/newlib/libc/stdlib/mbtowc_r.c
@@ -8206,7 +8252,7 @@ index 000000000..40092f99f
 +
 diff --git a/newlib/libc/sys/arm/sys/lock.h b/newlib/libc/sys/arm/sys/lock.h
 new file mode 100644
-index 000000000..567fed56b
+index 000000000..a755d6443
 --- /dev/null
 +++ b/newlib/libc/sys/arm/sys/lock.h
 @@ -0,0 +1,66 @@
@@ -8240,10 +8286,10 @@ index 000000000..567fed56b
 +extern int __libc_lock_try_acquire_recursive(_LOCK_RECURSIVE_T *lock);
 +
 +#define __LOCK_INIT(CLASS,NAME) \
-+CLASS _LOCK_T NAME = 1;
++CLASS _LOCK_T NAME = 0;
 +
 +#define __LOCK_INIT_RECURSIVE(CLASS,NAME) \
-+CLASS _LOCK_RECURSIVE_T NAME = {1,0,0};
++CLASS _LOCK_RECURSIVE_T NAME = {0,0,0};
 +
 +#define __lock_init(NAME) \
 +	__libc_lock_init(&(NAME))
@@ -8276,16 +8322,3 @@ index 000000000..567fed56b
 +	__libc_lock_release_recursive(&(NAME))
 +
 +#endif // __SYS_LOCK_H__
-diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h
-index 5b9464cca..e8969b954 100644
---- a/newlib/libc/sys/arm/sys/param.h
-+++ b/newlib/libc/sys/arm/sys/param.h
-@@ -19,6 +19,8 @@
- # define PATHSIZE (1024)
- #endif
- 
-+#define MAXPATHLEN	PATHSIZE
-+
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- 

dkarm-eabi/scripts/build-crtls.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+export DEVKITARM=$DEVKITPRO/devkitARM
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.gz
+cd devkitarm-rules-$DKARM_RULES_VER
+make install
+
+#---------------------------------------------------------------------------------
+# Install and build the crt0 files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+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 53" \
+		--disable-tm-clone-registry \
+		--disable-__cxa_atexit \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 59" \
 		$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.37.patch

@@ -0,0 +1,28 @@
+diff -NBaur binutils-2.37/libiberty/rust-demangle.c binutils-2.37-new/libiberty/rust-demangle.c
+--- binutils-2.37/libiberty/rust-demangle.c	2021-07-15 15:19:46.000000000 +0100
++++ binutils-2.37-new/libiberty/rust-demangle.c	2022-01-01 22:02:21.860422023 +0000
+@@ -75,10 +75,10 @@
+   int version;
+ 
+   /* Recursion depth.  */
+-  uint recursion;
++  unsigned recursion;
+   /* Maximum number of times demangle_path may be called recursively.  */
+ #define RUST_MAX_RECURSION_COUNT  1024
+-#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
++#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
+ 
+   uint64_t bound_lifetime_depth;
+ };
+diff -NBaur binutils-2.37/opcodes/ppc-opc.c binutils-2.37-new/opcodes/ppc-opc.c
+--- binutils-2.37/opcodes/ppc-opc.c	2021-07-08 12:37:21.000000000 +0100
++++ binutils-2.37-new/opcodes/ppc-opc.c	2022-01-01 22:02:04.409141184 +0000
+@@ -4302,7 +4302,7 @@
+ #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
+ 		 | PPC_OPCODE_TITAN)
+ #define BOOKE	PPC_OPCODE_BOOKE
+-#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
++#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
+ #define PPCE300 PPC_OPCODE_E300
+ #define PPCSPE	PPC_OPCODE_SPE
+ #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/gcc-12.1.0.patch

@@ -1,33 +1,33 @@
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..814104f32a2 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
- [
+diff -NBaur gcc-12.1.0/config/gthr.m4 gcc-12.1.0-dkppc/config/gthr.m4
+--- gcc-12.1.0/config/gthr.m4	2022-05-06 08:30:56.000000000 +0100
++++ gcc-12.1.0-dkppc/config/gthr.m4	2022-05-06 19:17:44.784777075 +0100
+@@ -13,6 +13,7 @@
  case $1 in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
++    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
+     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 47cfce25dee..cfd8ce71123 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2480,7 +2480,7 @@ powerpc-xilinx-eabi*)
- 	use_gcc_stdint=wrap
- 	;;
- powerpc-*-eabi*)
--	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h"
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/750cl.h"
- 	extra_options="${extra_options} rs6000/sysv4.opt"
- 	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
- 	use_gcc_stdint=wrap
-diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index f46e797d610..fd39e64c38d 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
+diff -NBaur gcc-12.1.0/gcc/config/i386/host-mingw32.cc gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc
+--- gcc-12.1.0/gcc/config/i386/host-mingw32.cc	2022-05-06 08:30:56.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/config/i386/host-mingw32.cc	2022-05-06 19:17:44.784777075 +0100
+@@ -45,7 +45,11 @@
+ 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 -NBaur gcc-12.1.0/gcc/config/newlib-stdint.h gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h
+--- gcc-12.1.0/gcc/config/newlib-stdint.h	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/config/newlib-stdint.h	2022-05-06 19:17:44.784777075 +0100
+@@ -25,7 +25,7 @@
  /* newlib uses 32-bit long in certain cases for all non-SPU
     targets.  */
  #ifndef STDINT_LONG32
@@ -36,19 +36,18 @@ index f46e797d610..fd39e64c38d 100644
  #endif
  
  #define SIG_ATOMIC_TYPE "int"
-diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index b83b304e3eb..b85359edcfc 100644
---- a/gcc/config/rs6000/rs6000.h
-+++ b/gcc/config/rs6000/rs6000.h
-@@ -212,6 +212,7 @@
-   { "asm_cpu_476",		ASM_CPU_476_SPEC },			\
-   SUBTARGET_EXTRA_SPECS
- 
-+#if 0
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/rs6000.h gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h
+--- gcc-12.1.0/gcc/config/rs6000/rs6000.h	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/rs6000.h	2022-05-06 19:22:10.793624730 +0100
+@@ -196,6 +196,7 @@
  /* -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.  */
-@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+    the condition in driver-rs6000.cc.  */
++#if 0
+ #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
+ /* In driver-rs6000.cc.  */
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -207,6 +208,8 @@
  #else
  #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
  #endif
@@ -57,42 +56,10 @@ index b83b304e3eb..b85359edcfc 100644
  
  #ifndef CC1_CPU_SPEC
  #ifdef HAVE_LOCAL_CPU_DETECT
-diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
-index 4dbe8e5d133..3e2095e5b64 100644
---- a/gcc/config/rs6000/rs6000.md
-+++ b/gcc/config/rs6000/rs6000.md
-@@ -5631,19 +5631,19 @@
-     tmp = gen_reg_rtx (DImode);
- 
-   emit_insn (gen_fctiwz_<mode> (tmp, src));
--  if (MEM_P (dest))
-+  if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
-     {
--      dest = rs6000_address_for_fpconvert (dest);
--      emit_insn (gen_stfiwx (dest, tmp));
-+      dest = gen_lowpart (DImode, dest);
-+      emit_move_insn (dest, tmp);
-       DONE;
-     }
--  else if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
-+   else if (MEM_P (dest) && MEM_ALIGN (dest) >= 32)
-     {
--      dest = gen_lowpart (DImode, dest);
--      emit_move_insn (dest, tmp);
-+      dest = rs6000_address_for_fpconvert (dest);
-+      emit_insn (gen_stfiwx (dest, tmp));
-       DONE;
-     }
--  else
-+   else
-     {
-       rtx stack = rs6000_allocate_stack_temp (SImode, false, true);
-       emit_insn (gen_stfiwx (stack, tmp));
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index bb19d0dcd41..74d1e474432 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.h gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h
+--- gcc-12.1.0/gcc/config/rs6000/sysv4.h	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.h	2022-05-06 19:17:44.784777075 +0100
+@@ -589,7 +589,11 @@
  
  /* Default starting address if specified.  */
  #define LINK_START_SPEC "\
@@ -105,7 +72,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(link_start_yellowknife) ; \
    mmvme        : %(link_start_mvme)        ; \
    msim         : %(link_start_sim)         ; \
-@@ -596,7 +600,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -620,7 +624,8 @@
  
  /* Any specific OS flags.  */
  #define LINK_OS_SPEC "\
@@ -115,7 +82,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(link_os_yellowknife) ; \
    mmvme        : %(link_os_mvme)        ; \
    msim         : %(link_os_sim)         ; \
-@@ -614,7 +619,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -635,7 +640,10 @@
  /* Override rs6000.h definition.  */
  #undef	CPP_SPEC
  #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -127,7 +94,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(cpp_os_yellowknife) ; \
    mmvme        : %(cpp_os_mvme)        ; \
    msim         : %(cpp_os_sim)         ; \
-@@ -628,7 +636,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -649,7 +657,10 @@
  
  #undef	STARTFILE_SPEC
  #define	STARTFILE_SPEC "\
@@ -139,7 +106,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(startfile_yellowknife) ; \
    mmvme        : %(startfile_mvme)        ; \
    msim         : %(startfile_sim)         ; \
-@@ -642,7 +653,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -663,7 +674,8 @@
  
  #undef	LIB_SPEC
  #define	LIB_SPEC "\
@@ -149,7 +116,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(lib_yellowknife) ; \
    mmvme        : %(lib_mvme)        ; \
    msim         : %(lib_sim)         ; \
-@@ -652,11 +664,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -673,11 +685,12 @@
    mcall-openbsd: %(lib_openbsd)     ; \
                 : %(lib_default)     }"
  
@@ -164,7 +131,7 @@ index bb19d0dcd41..74d1e474432 100644
    myellowknife : %(endfile_yellowknife) ; \
    mmvme        : %(endfile_mvme)        ; \
    msim         : %(endfile_sim)         ; \
-@@ -672,16 +685,27 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -693,16 +706,27 @@
  
  /* Motorola ADS support.  */
  #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -192,7 +159,7 @@ index bb19d0dcd41..74d1e474432 100644
  
  /* Motorola Yellowknife support.  */
  #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -882,6 +906,7 @@ ncrtn.o%s"
+@@ -850,6 +874,7 @@
  #undef	SUBTARGET_EXTRA_SPECS
  #define	SUBTARGET_EXTRA_SPECS						\
    { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -200,7 +167,7 @@ index bb19d0dcd41..74d1e474432 100644
    { "lib_ads",			LIB_ADS_SPEC },				\
    { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
    { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -891,6 +916,7 @@ ncrtn.o%s"
+@@ -859,6 +884,7 @@
    { "lib_netbsd",		LIB_NETBSD_SPEC },			\
    { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
    { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -208,7 +175,7 @@ index bb19d0dcd41..74d1e474432 100644
    { "startfile_ads",		STARTFILE_ADS_SPEC },			\
    { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
    { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -900,6 +926,7 @@ ncrtn.o%s"
+@@ -868,6 +894,7 @@
    { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
    { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
    { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -216,7 +183,7 @@ index bb19d0dcd41..74d1e474432 100644
    { "endfile_ads",		ENDFILE_ADS_SPEC },			\
    { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
    { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -911,7 +938,11 @@ ncrtn.o%s"
+@@ -879,7 +906,11 @@
    { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
    { "link_shlib",		LINK_SHLIB_SPEC },			\
    { "link_start",		LINK_START_SPEC },			\
@@ -228,7 +195,7 @@ index bb19d0dcd41..74d1e474432 100644
    { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
    { "link_start_mvme",		LINK_START_MVME_SPEC },			\
    { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -921,6 +952,7 @@ ncrtn.o%s"
+@@ -889,6 +920,7 @@
    { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
    { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
    { "link_os",			LINK_OS_SPEC },				\
@@ -236,7 +203,7 @@ index bb19d0dcd41..74d1e474432 100644
    { "link_os_ads",		LINK_OS_ADS_SPEC },			\
    { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
    { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -932,6 +964,9 @@ ncrtn.o%s"
+@@ -900,6 +932,9 @@
    { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
    { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
    { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
@@ -246,11 +213,10 @@ index bb19d0dcd41..74d1e474432 100644
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
-index 34fea0ddd08..084a8ae435e 100644
---- a/gcc/config/rs6000/sysv4.opt
-+++ b/gcc/config/rs6000/sysv4.opt
-@@ -124,6 +124,26 @@ mads
+diff -NBaur gcc-12.1.0/gcc/config/rs6000/sysv4.opt gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt
+--- gcc-12.1.0/gcc/config/rs6000/sysv4.opt	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/config/rs6000/sysv4.opt	2022-05-06 19:17:44.784777075 +0100
+@@ -124,6 +124,26 @@
  Target RejectNegative
  Link with libads.a, libc.a and crt0.o.
  
@@ -277,11 +243,10 @@ index 34fea0ddd08..084a8ae435e 100644
  myellowknife
  Target RejectNegative
  Link with libyk.a, libc.a and crt0.o.
-diff --git a/gcc/configure b/gcc/configure
-index 97ba7d7d69c..c0e468546ed 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
+diff -NBaur gcc-12.1.0/gcc/configure gcc-12.1.0-dkppc/gcc/configure
+--- gcc-12.1.0/gcc/configure	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/configure	2022-05-06 19:17:44.788859483 +0100
+@@ -12884,7 +12884,7 @@
      # default
      target_thread_file='single'
      ;;
@@ -290,11 +255,10 @@ index 97ba7d7d69c..c0e468546ed 100755
    single | tpf | vxworks | win32)
      target_thread_file=${enable_threads}
      ;;
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d6f2d5b2ed0..15edac2ce9b 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1611,7 +1611,7 @@ case ${enable_threads} in
+diff -NBaur gcc-12.1.0/gcc/configure.ac gcc-12.1.0-dkppc/gcc/configure.ac
+--- gcc-12.1.0/gcc/configure.ac	2022-05-06 08:30:57.000000000 +0100
++++ gcc-12.1.0-dkppc/gcc/configure.ac	2022-05-06 19:17:44.788859483 +0100
+@@ -1994,7 +1994,7 @@
      # default
      target_thread_file='single'
      ;;
@@ -303,10 +267,9 @@ index d6f2d5b2ed0..15edac2ce9b 100644
    single | tpf | vxworks | win32)
      target_thread_file=${enable_threads}
      ;;
-diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
-index ba2b2623301..8d866107142 100644
---- a/libgcc/config/rs6000/crtrestvr.S
-+++ b/libgcc/config/rs6000/crtrestvr.S
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S
+--- gcc-12.1.0/libgcc/config/rs6000/crtrestvr.S	2022-05-06 08:30:59.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtrestvr.S	2022-05-06 19:17:44.792941894 +0100
 @@ -24,7 +24,7 @@
  
  /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -316,15 +279,14 @@ index ba2b2623301..8d866107142 100644
  #undef __ALTIVEC__
  #define __ALTIVEC__ 1
  	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
+@@ -86,3 +86,4 @@
  CFI_ENDPROC
  
  #endif
 +#endif
-diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
-index 077e33f34d5..b7be68b710f 100644
---- a/libgcc/config/rs6000/crtsavevr.S
-+++ b/libgcc/config/rs6000/crtsavevr.S
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S
+--- gcc-12.1.0/libgcc/config/rs6000/crtsavevr.S	2022-05-06 08:30:59.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/crtsavevr.S	2022-05-06 19:17:44.792941894 +0100
 @@ -24,7 +24,7 @@
  
  /* On PowerPC64 Linux, these functions are provided by the linker.  */
@@ -334,17 +296,15 @@ index 077e33f34d5..b7be68b710f 100644
  #undef __ALTIVEC__
  #define __ALTIVEC__ 1
  	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
+@@ -86,3 +86,4 @@
  CFI_ENDPROC
  
  #endif
 +#endif
-diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
-new file mode 100644
-index 00000000000..94d6ba94ec0
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.c
-@@ -0,0 +1,349 @@
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c
+--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.c	1970-01-01 01:00:00.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.c	2022-05-06 19:17:44.792941894 +0100
+@@ -0,0 +1,319 @@
 +/* Threads compatibility routines for libgcc2 and libobjc.  */
 +/* Compile this one with gcc.  */
 +/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
@@ -370,336 +330,304 @@ index 00000000000..94d6ba94ec0
 +see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +<http://www.gnu.org/licenses/>.  */
 +
++#define _BUILDING_LIBGCC
 +#include "gthr-dkp.h"
 +#include <stddef.h>
 +
-+__gthread_impl_t __gthread_impl = {
-+  NULL, // active
-+  NULL, // create
-+  NULL, // join
-+  NULL, // detach
-+  NULL, // equal
-+  NULL, // self
-+  NULL, // yield
-+  NULL, // once
-+  NULL, // key_create
-+  NULL, // key_delete
-+  NULL, // getspecific
-+  NULL, // setspecific
-+  NULL, // mutex_init_function
-+  NULL, // mutex_destroy
-+  NULL, // mutex_lock
-+  NULL, // mutex_trylock
-+  NULL, // mutex_unlock
-+  NULL, // recursive_mutex_init_function
-+  NULL, // recursive_mutex_lock
-+  NULL, // recursive_mutex_trylock
-+  NULL, // recursive_mutex_unlock
-+  NULL, // recursive_mutex_destroy
-+  NULL, // cond_init_function
-+  NULL, // cond_broadcast
-+  NULL, // cond_signal
-+  NULL, // cond_wait
-+  NULL, // cond_timedwait
-+  NULL, // cond_wait_recursive
-+  NULL, // cond_destroy
-+};
 +
 +int
 +__gthread_active_p (void)
 +{
-+  if (!__gthread_impl.active) {
++  if (!__has_gthr_impl(active)) {
 +    return 0;
 +  }
 +
-+  return __gthread_impl.active();
++  return __gthr_impl_active();
 +}
 +
 +int
 +__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
 +                  void *__args)
 +{
-+  if (!__gthread_impl.create) {
++  if (!__has_gthr_impl(create)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.create(__threadid, __func, __args);
++  return __gthr_impl_create(__threadid, __func, __args);
 +}
 +
 +int
 +__gthread_join (__gthread_t __threadid, void **__value_ptr)
 +{
-+  if (!__gthread_impl.join) {
++  if (!__has_gthr_impl(join)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.join(__threadid, __value_ptr);
++  return __gthr_impl_join(__threadid, __value_ptr);
 +}
 +
 +int
 +__gthread_detach (__gthread_t __threadid)
 +{
-+  if (!__gthread_impl.detach) {
++  if (!__has_gthr_impl(detach)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.detach(__threadid);
++  return __gthr_impl_detach(__threadid);
 +}
 +
 +int
 +__gthread_equal (__gthread_t __t1, __gthread_t __t2)
 +{
-+  if (!__gthread_impl.equal) {
++  if (!__has_gthr_impl(equal)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.equal(__t1, __t2);
++  return __gthr_impl_equal(__t1, __t2);
 +}
 +
 +__gthread_t
 +__gthread_self (void)
 +{
-+  if (!__gthread_impl.self) {
++  if (!__has_gthr_impl(self)) {
 +    __gthread_t result = { 0 };
 +    return result;
 +  }
 +
-+  return __gthread_impl.self();
++  return __gthr_impl_self();
 +}
 +
 +int
 +__gthread_yield (void)
 +{
-+  if (!__gthread_impl.yield) {
++  if (!__has_gthr_impl(yield)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.yield();
++  return __gthr_impl_yield();
 +}
 +
 +int
 +__gthread_once (__gthread_once_t *__once, void (*__func) (void))
 +{
-+  if (!__gthread_impl.once) {
++  if (!__has_gthr_impl(once)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.once(__once, __func);
++  return __gthr_impl_once(__once, __func);
 +}
 +
 +int
 +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
 +{
-+  if (!__gthread_impl.key_create) {
++  if (!__has_gthr_impl(key_create)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.key_create(__key, __dtor);
++  return __gthr_impl_key_create(__key, __dtor);
 +}
 +
 +int
 +__gthread_key_delete (__gthread_key_t __key)
 +{
-+  if (!__gthread_impl.key_delete) {
++  if (!__has_gthr_impl(key_delete)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.key_delete(__key);
++  return __gthr_impl_key_delete(__key);
 +}
 +
 +void *
 +__gthread_getspecific (__gthread_key_t __key)
 +{
-+  if (!__gthread_impl.getspecific) {
++  if (!__has_gthr_impl(getspecific)) {
 +    return NULL;
 +  }
 +
-+  return __gthread_impl.getspecific(__key);
++  return __gthr_impl_getspecific(__key);
 +}
 +
 +int
 +__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
 +{
-+  if (!__gthread_impl.setspecific) {
++  if (!__has_gthr_impl(setspecific)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.setspecific(__key, __ptr);
++  return __gthr_impl_setspecific(__key, __ptr);
 +}
 +
 +void
 +__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
 +{
-+  if (__gthread_impl.mutex_init_function) {
-+    __gthread_impl.mutex_init_function(__mutex);
++  if (__has_gthr_impl(mutex_init_function)) {
++    __gthr_impl_mutex_init_function(__mutex);
 +  }
 +}
 +
 +int
 +__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.mutex_destroy) {
++  if (!__has_gthr_impl(mutex_destroy)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.mutex_destroy(__mutex);
++  return __gthr_impl_mutex_destroy(__mutex);
 +}
 +
 +int
 +__gthread_mutex_lock (__gthread_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.mutex_lock) {
++  if (!__has_gthr_impl(mutex_lock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.mutex_lock(__mutex);
++  return __gthr_impl_mutex_lock(__mutex);
 +}
 +
 +int
 +__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.mutex_trylock) {
++  if (!__has_gthr_impl(mutex_trylock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.mutex_trylock(__mutex);
++  return __gthr_impl_mutex_trylock(__mutex);
 +}
 +
 +int
 +__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.mutex_unlock) {
++  if (!__has_gthr_impl(mutex_unlock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.mutex_unlock(__mutex);
++  return __gthr_impl_mutex_unlock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.recursive_mutex_init_function) {
++  if (!__has_gthr_impl(recursive_mutex_init_function)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.recursive_mutex_init_function(__mutex);
++  return __gthr_impl_recursive_mutex_init_function(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.recursive_mutex_lock) {
++  if (!__has_gthr_impl(recursive_mutex_lock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.recursive_mutex_lock(__mutex);
++  return __gthr_impl_recursive_mutex_lock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.recursive_mutex_trylock) {
++  if (!__has_gthr_impl(recursive_mutex_trylock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.recursive_mutex_trylock(__mutex);
++  return __gthr_impl_recursive_mutex_trylock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.recursive_mutex_unlock) {
++  if (!__has_gthr_impl(recursive_mutex_unlock)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.recursive_mutex_unlock(__mutex);
++  return __gthr_impl_recursive_mutex_unlock(__mutex);
 +}
 +
 +int
 +__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.recursive_mutex_destroy) {
++  if (!__has_gthr_impl(recursive_mutex_destroy)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.recursive_mutex_destroy(__mutex);
++  return __gthr_impl_recursive_mutex_destroy(__mutex);
 +}
 +
 +void
 +__gthread_cond_init_function (__gthread_cond_t *__cond)
 +{
-+  if (__gthread_impl.cond_init_function) {
-+    __gthread_impl.cond_init_function(__cond);
++  if (__has_gthr_impl(cond_init_function)) {
++    __gthr_impl_cond_init_function(__cond);
 +  }
 +}
 +
 +int
 +__gthread_cond_broadcast (__gthread_cond_t *__cond)
 +{
-+  if (!__gthread_impl.cond_broadcast) {
++  if (!__has_gthr_impl(cond_broadcast)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_broadcast(__cond);
++  return __gthr_impl_cond_broadcast(__cond);
 +}
 +
 +int
 +__gthread_cond_signal (__gthread_cond_t *__cond)
 +{
-+  if (!__gthread_impl.cond_signal) {
++  if (!__has_gthr_impl(cond_signal)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_signal(__cond);
++  return __gthr_impl_cond_signal(__cond);
 +}
 +
 +int
 +__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.cond_wait) {
++  if (!__has_gthr_impl(cond_wait)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_wait(__cond, __mutex);
++  return __gthr_impl_cond_wait(__cond, __mutex);
 +}
 +
 +int
 +__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
 +                          const __gthread_time_t *__abs_timeout)
 +{
-+  if (!__gthread_impl.cond_timedwait) {
++  if (!__has_gthr_impl(cond_timedwait)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_timedwait(__cond, __mutex, __abs_timeout);
++  return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
 +}
 +
 +int
 +__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
 +                               __gthread_recursive_mutex_t *__mutex)
 +{
-+  if (!__gthread_impl.cond_wait_recursive) {
++  if (!__has_gthr_impl(cond_wait_recursive)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_wait_recursive(__cond, __mutex);
++  return __gthr_impl_cond_wait_recursive(__cond, __mutex);
 +}
 +
 +int
 +__gthread_cond_destroy (__gthread_cond_t* __cond)
 +{
-+  if (!__gthread_impl.cond_destroy) {
++  if (!__has_gthr_impl(cond_destroy)) {
 +    return -1;
 +  }
 +
-+  return __gthread_impl.cond_destroy(__cond);
++  return __gthr_impl_cond_destroy(__cond);
 +}
-diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
-new file mode 100644
-index 00000000000..281c19d2a60
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.h
-@@ -0,0 +1,185 @@
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h
+--- gcc-12.1.0/libgcc/config/rs6000/gthr-dkp.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/gthr-dkp.h	2022-05-06 19:17:44.792941894 +0100
+@@ -0,0 +1,187 @@
 +/* Threads compatibility routines for libgcc2 and libobjc.  */
 +/* Compile this one with gcc.  */
 +/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
@@ -753,42 +681,44 @@ index 00000000000..281c19d2a60
 +#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
 +#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
 +
-+typedef struct {
-+  int (*active) (void);
-+  int (*create) (__gthread_t *__threadid, void *(*__func) (void*),
-+                 void *__args);
-+  int (*join) (__gthread_t __threadid, void **__value_ptr);
-+  int (*detach) (__gthread_t __threadid);
-+  int (*equal) (__gthread_t __t1, __gthread_t __t2);
-+  __gthread_t (*self) (void);
-+  int (*yield) (void);
-+  int (*once) (__gthread_once_t *__once, void (*__func) (void));
-+  int (*key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
-+  int (*key_delete) (__gthread_key_t __key);
-+  void * (*getspecific) (__gthread_key_t __key);
-+  int (*setspecific) (__gthread_key_t __key, const void *__ptr);
-+  void (*mutex_init_function) (__gthread_mutex_t *__mutex);
-+  int (*mutex_destroy) (__gthread_mutex_t *__mutex);
-+  int (*mutex_lock) (__gthread_mutex_t *__mutex);
-+  int (*mutex_trylock) (__gthread_mutex_t *__mutex);
-+  int (*mutex_unlock) (__gthread_mutex_t *__mutex);
-+  int (*recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
-+  void (*cond_init_function) (__gthread_cond_t *__cond);
-+  int (*cond_broadcast) (__gthread_cond_t *__cond);
-+  int (*cond_signal) (__gthread_cond_t *__cond);
-+  int (*cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
-+  int (*cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                         const __gthread_time_t *__abs_timeout);
-+  int (*cond_wait_recursive) (__gthread_cond_t *__cond,
-+                              __gthread_recursive_mutex_t *__mutex);
-+  int (*cond_destroy) (__gthread_cond_t* __cond);
-+} __gthread_impl_t;
++#ifdef _BUILDING_LIBGCC
++#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
++#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
++#else
++#define __GTHR_IMPL(_name) __gthr_impl_##_name
++#endif
 +
-+extern __gthread_impl_t __gthread_impl;
++int __GTHR_IMPL(active) (void);
++int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
++int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
++int __GTHR_IMPL(detach) (__gthread_t __threadid);
++int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
++__gthread_t __GTHR_IMPL(self) (void);
++int __GTHR_IMPL(yield) (void);
++int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
++int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
++int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
++void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
++int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
++void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
++int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
++int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
++int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
++int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
++int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
++int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
++int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
++int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
++int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
++void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
++int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
++int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
++int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
++int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
++                         const __gthread_time_t *__abs_timeout);
++int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
++                              __gthread_recursive_mutex_t *__mutex);
++int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
 +
 +int
 +__gthread_active_p (void);
@@ -885,49 +815,46 @@ index 00000000000..281c19d2a60
 +#endif
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
-diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
-index fb812d3801f..7f6669d530f 100644
---- a/libgcc/config/rs6000/t-ppccomm
-+++ b/libgcc/config/rs6000/t-ppccomm
+diff -NBaur gcc-12.1.0/libgcc/config/rs6000/t-ppccomm gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm
+--- gcc-12.1.0/libgcc/config/rs6000/t-ppccomm	2022-05-06 08:30:59.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/config/rs6000/t-ppccomm	2022-05-06 19:17:44.792941894 +0100
 @@ -1,4 +1,5 @@
  LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
 +	   $(srcdir)/config/rs6000/gthr-dkp.c \
  	   $(srcdir)/config/rs6000/tramp.S
  
  # This can't end up in shared libgcc
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..c6f93f8b3ac 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
- 
+diff -NBaur gcc-12.1.0/libgcc/configure gcc-12.1.0-dkppc/libgcc/configure
+--- gcc-12.1.0/libgcc/configure	2022-05-06 08:30:59.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/configure	2022-05-06 19:17:44.792941894 +0100
+@@ -5689,6 +5689,7 @@
  case $target_thread_file in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
++    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
+     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 5e894455e16..f2347455de0 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+diff -NBaur gcc-12.1.0/libgcc/crtstuff.c gcc-12.1.0-dkppc/libgcc/crtstuff.c
+--- gcc-12.1.0/libgcc/crtstuff.c	2022-05-06 08:30:59.000000000 +0100
++++ gcc-12.1.0-dkppc/libgcc/crtstuff.c	2022-05-06 19:17:44.792941894 +0100
+@@ -325,7 +325,7 @@
  
- /* Target machine header files require this define. */
- #define IN_LIBGCC2
-+#define USED_FOR_TARGET
- 
- /* FIXME: Including auto-host is incorrect, but until we have
-    identified the set of defines that need to go into auto-target.h,
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 61457e940ec..a7c63407ced 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15382,6 +15382,7 @@ $as_echo "$target_thread_file" >&6; }
+ #ifdef OBJECT_FORMAT_ELF
  
+-#if DEFAULT_USE_CXA_ATEXIT
++#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
+diff -NBaur gcc-12.1.0/libstdc++-v3/configure gcc-12.1.0-dkppc/libstdc++-v3/configure
+--- gcc-12.1.0/libstdc++-v3/configure	2022-05-06 08:31:00.000000000 +0100
++++ gcc-12.1.0-dkppc/libstdc++-v3/configure	2022-05-06 19:17:44.801106712 +0100
+@@ -15765,6 +15765,7 @@
  case $target_thread_file in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
      dce)	thread_header=config/pa/gthr-dce.h ;;
++    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
+     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
      lynx)	thread_header=config/gthr-lynx.h ;;
      mipssde)	thread_header=config/mips/gthr-mipssde.h ;;

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/patches/newlib-4.2.0.20211231.patch

@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 0d2918cee..bccfb07b4 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
  
  fi
  
@@ -11,12 +11,12 @@ index 0d2918cee..bccfb07b4 100755
  DEPDIR="${am__leading_dot}deps"
  
  ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index f38d5298e..db6b33ab8 100644
---- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..42ea1d2ed 100644
+--- a/libgloss/configure.ac
++++ b/libgloss/configure.ac
 @@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
  AC_INIT([libgloss],[LIBGLOSS_VERSION])
  AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
@@ -33,7 +33,7 @@ index f38d5298e..db6b33ab8 100644
  case "${target}" in
    aarch64*-*-*)
  	AC_CONFIG_SUBDIRS(aarch64)
-@@ -194,6 +198,10 @@ if test "${config_libnosys}" = "true"; then
+@@ -197,6 +201,10 @@ if test "${config_libnosys}" = "true"; then
    AC_CONFIG_SUBDIRS([libnosys])
  fi
  
@@ -46,7 +46,7 @@ index f38d5298e..db6b33ab8 100644
  AC_SUBST(AS)
 diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
 new file mode 100644
-index 000000000..183f9acc7
+index 000000000..bd69599a8
 --- /dev/null
 +++ b/libgloss/libsysbase/Makefile.in
 @@ -0,0 +1,148 @@
@@ -121,8 +121,8 @@ index 000000000..183f9acc7
 +	isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
 +	unlink.o wait.o write.o _exit.o malloc_vars.o \
 +	chdir.o mkdir.o rename.o build_argv.o statvfs.o \
-+	flock.o syscall_support.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
-+	fchmod.o chmod.o rmdir.o utime.o scandir.o
++	flock.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
++	fchmod.o chmod.o rmdir.o utime.o scandir.o syscall_support.o
 +
 +# Object files specific to particular targets.
 +EVALOBJS = ${OBJS}
@@ -143,10 +143,10 @@ index 000000000..183f9acc7
 +AR_FLAGS = qc
 +
 +.c.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
++	$(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
 +
 +.C.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
++	$(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
 +.s.o:
 +	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
 +
@@ -200,7 +200,7 @@ index 000000000..183f9acc7
 +	$(SHELL) config.status --recheck
 diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
 new file mode 100644
-index 000000000..e5cb5a9ed
+index 000000000..6effb1105
 --- /dev/null
 +++ b/libgloss/libsysbase/_exit.c
 @@ -0,0 +1,17 @@
@@ -215,8 +215,8 @@ index 000000000..e5cb5a9ed
 +void _exit(int rc)
 +{
 +
-+	if ( __syscalls.exit ) {
-+		__syscalls.exit(rc);
++	if ( __has_syscall(exit) ) {
++		__syscall_exit(rc);
 +	}
 +
 +	while(1);
@@ -903,7 +903,7 @@ index 000000000..3668b5801
 +
 diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
 new file mode 100644
-index 000000000..01cfee469
+index 000000000..b36b5c079
 --- /dev/null
 +++ b/libgloss/libsysbase/clocks.c
 @@ -0,0 +1,34 @@
@@ -913,8 +913,8 @@ index 000000000..01cfee469
 +
 +int clock_gettime(clockid_t clock_id, struct timespec *tp)
 +{
-+   if ( __syscalls.clock_gettime ) {
-+      return __syscalls.clock_gettime(clock_id, tp);
++   if ( __has_syscall(clock_gettime) ) {
++      return __syscall_clock_gettime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -923,8 +923,8 @@ index 000000000..01cfee469
 +
 +int clock_settime(clockid_t clock_id, const struct timespec *tp)
 +{
-+   if ( __syscalls.clock_settime ) {
-+      return __syscalls.clock_settime(clock_id, tp);
++   if ( __has_syscall(clock_settime) ) {
++      return __syscall_clock_settime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -933,8 +933,8 @@ index 000000000..01cfee469
 +
 +int clock_getres (clockid_t clock_id, struct timespec *res)
 +{
-+   if ( __syscalls.clock_getres ) {
-+      return __syscalls.clock_getres(clock_id, res);
++   if ( __has_syscall(clock_getres) ) {
++      return __syscall_clock_getres(clock_id, res);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -5938,7 +5938,7 @@ index 000000000..ec3b84037
 +
 diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
 new file mode 100644
-index 000000000..11dc528fa
+index 000000000..ee8947f51
 --- /dev/null
 +++ b/libgloss/libsysbase/gettod.c
 @@ -0,0 +1,26 @@
@@ -5961,7 +5961,7 @@ index 000000000..11dc528fa
 +	struct _reent *ptr = _REENT;
 +#endif
 +
-+	if ( __syscalls.gettod_r ) return __syscalls.gettod_r(ptr, ptimeval, ptimezone);
++	if ( __has_syscall(gettod_r) ) return __syscall_gettod_r(ptr, ptimeval, ptimezone);
 +
 +	ptr->_errno = ENOSYS;
 +	return -1;
@@ -6518,7 +6518,7 @@ index 000000000..b4fcbd3d7
 +}
 diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
 new file mode 100644
-index 000000000..3c96fc61b
+index 000000000..a233b9df6
 --- /dev/null
 +++ b/libgloss/libsysbase/nanosleep.c
 @@ -0,0 +1,14 @@
@@ -6528,8 +6528,8 @@ index 000000000..3c96fc61b
 +
 +int nanosleep(const struct timespec *req, struct timespec *rem)
 +{
-+   if ( __syscalls.nanosleep ) {
-+      return __syscalls.nanosleep(req, rem);
++   if ( __has_syscall(nanosleep) ) {
++      return __syscall_nanosleep(req, rem);
 +   } else {
 +      *rem = *req;
 +      errno = ENOSYS;
@@ -6680,10 +6680,10 @@ index 000000000..1d7b7e8e7
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -6691,27 +6691,36 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
++int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
++			ptr->deviceData = devoptab_list[dev]->deviceData;
++			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
++			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
++		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
++
++#ifndef _REENT_ONLY
++
++int
++rmdir (const char *filename)
++{
++  return _rmdir_r (_REENT, filename);
++}
++
++#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
-index 000000000..e2bdb9edc
+index 000000000..83d922d85
 --- /dev/null
 +++ b/libgloss/libsysbase/sbrk.c
 @@ -0,0 +1,26 @@
@@ -6731,8 +6740,8 @@ index 000000000..e2bdb9edc
 +#endif
 +
 +
-+	if ( __syscalls.sbrk_r ) {
-+		return __syscalls.sbrk_r(ptr, incr);
++	if ( __has_syscall(sbrk_r) ) {
++		return __syscall_sbrk_r(ptr, incr);
 +	} else {
 +
 +		ptr->_errno = ENOMEM;
@@ -6922,34 +6931,16 @@ index 000000000..84e221340
 +}
 diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
 new file mode 100644
-index 000000000..f02714764
+index 000000000..39e75fd0b
 --- /dev/null
 +++ b/libgloss/libsysbase/syscall_support.c
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,49 @@
 +#include <sys/iosupport.h>
 +
-+//---------------------------------------------------------------------------------
-+__syscalls_t __syscalls = {
-+//---------------------------------------------------------------------------------
-+	NULL,	// sbrk
-+	NULL,	// lock_init
-+	NULL,	// lock_close
-+	NULL,	// lock_release
-+	NULL,	// lock_acquire
-+	NULL,	// malloc_lock
-+	NULL,	// malloc_unlock
-+	NULL,	// exit
-+	NULL,	// gettod_r
-+	NULL,	// clock_gettime
-+	NULL,	// clock_settime
-+	NULL,	// clock_getres
-+	NULL	// nanosleep
-+};
-+
 +int __libc_lock_init(int *lock,int recursive) {
 +
-+	if ( __syscalls.lock_init ) {
-+		return __syscalls.lock_init(lock, recursive);
++	if ( __has_syscall(lock_init) ) {
++		return __syscall_lock_init(lock, recursive);
 +	}
 +
 +	return 0;
@@ -6957,8 +6948,8 @@ index 000000000..f02714764
 +
 +int __libc_lock_close( int *lock ) {
 +
-+	if ( __syscalls.lock_close) {
-+		return __syscalls.lock_close(lock);
++	if ( __has_syscall(lock_close)) {
++		return __syscall_lock_close(lock);
 +	}
 +
 +	return 0;
@@ -6966,8 +6957,8 @@ index 000000000..f02714764
 +
 +int __libc_lock_release( int *lock ) {
 +
-+	if ( __syscalls.lock_release) {
-+		return __syscalls.lock_release(lock);
++	if ( __has_syscall(lock_release)) {
++		return __syscall_lock_release(lock);
 +	}
 +
 +	return 0;
@@ -6975,22 +6966,22 @@ index 000000000..f02714764
 +
 +int __libc_lock_acquire( int *lock ) {
 +
-+	if ( __syscalls.lock_acquire) {
-+		return __syscalls.lock_acquire(lock);
++	if ( __has_syscall(lock_acquire)) {
++		return __syscall_lock_acquire(lock);
 +	}
 +
 +	return 0;
 +}
 +
 +void __malloc_lock( struct _reent *ptr ) {
-+	if ( __syscalls.malloc_lock) {
-+		__syscalls.malloc_lock(ptr);
++	if ( __has_syscall(malloc_lock) ){
++		__syscall_malloc_lock(ptr);
 +	}
 +}
 +
 +void __malloc_unlock( struct _reent *ptr ) {
-+	if ( __syscalls.malloc_unlock) {
-+		__syscalls.malloc_unlock(ptr);
++	if ( __has_syscall(malloc_unlock)) {
++		__syscall_malloc_unlock(ptr);
 +	}
 +}
 diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
@@ -7390,15 +7381,16 @@ index 000000000..bd25d775d
 +	exit ( main(__system_argv->argc,__system_argv->argv) );
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index a84c0c80a..0921e00be 100644
+index c429dde1c..350dbc8f0 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -853,7 +853,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -863,7 +863,13 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
  	default_newlib_io_long_long="yes"
  	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
  	;;
 -  powerpc*-*-eabi* | \
 +  powerpc*-*-eabi*)
++	default_newlib_io_c99_formats="yes"
 +	default_newlib_io_long_long="yes"
 +	newlib_cflags="${newlib_cflags} -DREENTRANT_SYSCALLS_PROVIDED -D__DEFAULT_UTF8__"
 +	newlib_cflags="${newlib_cflags} -ffunction-sections -fdata-sections"
@@ -7407,6 +7399,44 @@ index a84c0c80a..0921e00be 100644
    powerpc*-*-elf* | \
    powerpc*-*-linux* | \
    powerpc*-*-rtem* | \
+diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
+index 5e30f09be..1ea357f92 100644
+--- a/newlib/libc/ctype/jp2uc.c
++++ b/newlib/libc/ctype/jp2uc.c
+@@ -35,7 +35,7 @@
+ #ifdef _MB_CAPABLE
+ /* Under Cygwin, the incoming wide character is already given in UTF due
+    to the requirements of the underlying OS. */
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__DEVKITA64__)
+ 
+ #include <_ansi.h>
+ #include <string.h>
+diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
+index 5c293c83d..75ccf89f5 100644
+--- a/newlib/libc/ctype/local.h
++++ b/newlib/libc/ctype/local.h
+@@ -32,7 +32,7 @@
+    * for towupper and towlower, the result must be back-transformed
+      into the respective locale encoding; currently NOT IMPLEMENTED
+ */
+-#ifdef __CYGWIN__
++#if defined(__CYGWIN__) || defined(__DEVKITA64__)
+ /* Under Cygwin, wchar_t (or its extension wint_t) is Unicode */
+ #define _jp2uc(c) (c)
+ #define _jp2uc_l(c, l) (c)
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
++++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
++extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/sys/dirent.h b/newlib/libc/include/sys/dirent.h
 index a3fb5c02c..adb8e1083 100644
 --- a/newlib/libc/include/sys/dirent.h
@@ -7471,10 +7501,10 @@ index a3fb5c02c..adb8e1083 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index 218807178..c9efd7d03 100644
+index 45476ce4a..d76706321 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,9 @@ extern "C" {
+@@ -331,6 +331,9 @@ extern "C" {
  #  define __SSP_FORTIFY_LEVEL 0
  #endif
  
@@ -7486,10 +7516,10 @@ index 218807178..c9efd7d03 100644
  #ifdef __rtems__
 diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
 new file mode 100644
-index 000000000..8b6d8da30
+index 000000000..9bec9e473
 --- /dev/null
 +++ b/newlib/libc/include/sys/iosupport.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,117 @@
 +//---------------------------------------------------------------------------------
 +#ifndef __iosupp_h__
 +#define __iosupp_h__
@@ -7524,6 +7554,7 @@ index 000000000..8b6d8da30
 +    void *dirStruct;
 +} DIR_ITER;
 +
++
 +typedef struct {
 +	const char *name;
 +	size_t structSize;
@@ -7562,23 +7593,31 @@ index 000000000..8b6d8da30
 +
 +extern const devoptab_t *devoptab_list[];
 +
-+typedef struct {
-+	void *(*sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
-+	int (*lock_init) (int *lock,int recursive);
-+	int (*lock_close) (int *lock);
-+	int (*lock_release) (int *lock);
-+	int (*lock_acquire) (int *lock);
-+	void (*malloc_lock) (struct _reent *ptr);
-+	void (*malloc_unlock) (struct _reent *ptr);
-+	void (*exit) ( int rc );
-+	int (*gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
-+	int (*clock_gettime)(clockid_t clock_id, struct timespec *tp);
-+	int (*clock_settime)(clockid_t clock_id, const struct timespec *tp);
-+	int (*clock_getres)(clockid_t clock_id, struct timespec *res);
-+	int (*nanosleep)(const struct timespec *req, struct timespec *rem);
-+} __syscalls_t;
++#ifdef _BUILDING_LIBSYSBASE
++#define __SYSCALL(_name) __attribute__((weak)) __syscall_##_name
++#define __has_syscall(_name) (&__syscall_##_name)
++#else
++#define __SYSCALL(_name) __syscall_##_name
++#endif
 +
-+extern __syscalls_t __syscalls;
++void *__SYSCALL(sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
++int  __SYSCALL(lock_init) (int *lock,int recursive);
++
++int  __SYSCALL(lock_close) (int *lock);
++int  __SYSCALL(lock_release) (int *lock);
++int  __SYSCALL(lock_acquire) (int *lock);
++void __SYSCALL(malloc_lock) (struct _reent *ptr);
++void __SYSCALL(malloc_unlock) (struct _reent *ptr);
++
++void __SYSCALL(exit)(int rc);
++
++int  __SYSCALL(gettod_r)(struct _reent *ptr, struct timeval *tp, struct timezone *tz);
++int __SYSCALL(clock_gettime)(clockid_t clock_id, struct timespec *tp);
++int __SYSCALL(clock_settime)(clockid_t clock_id, const struct timespec *tp);
++int __SYSCALL(clock_getres)(clockid_t clock_id, struct timespec *res);
++int __SYSCALL(nanosleep)(const struct timespec *req, struct timespec *rem);
++
++#undef __SYSCALL
 +
 +int AddDevice( const devoptab_t* device);
 +int FindDevice(const char* name);
@@ -7599,7 +7638,7 @@ index 000000000..8b6d8da30
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 74b70e9c0..d8c5410ec 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
 @@ -421,6 +421,8 @@ struct _reent
@@ -7620,7 +7659,7 @@ index 74b70e9c0..d8c5410ec 100644
  
  #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index 8769112b0..5526e59ee 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
 @@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
@@ -7677,10 +7716,10 @@ index 000000000..380329d34
 +#endif // _SYS_STATVFS_H
 \ No newline at end of file
 diff --git a/newlib/libc/include/sys/syslimits.h b/newlib/libc/include/sys/syslimits.h
-index ba9dbd667..93ed11a42 100644
+index c872d2018..9ccdbc51a 100644
 --- a/newlib/libc/include/sys/syslimits.h
 +++ b/newlib/libc/include/sys/syslimits.h
-@@ -44,12 +44,12 @@
+@@ -40,12 +40,12 @@
  #define	LINK_MAX		32767	/* max file link count */
  #define	MAX_CANON		  255	/* max bytes in term canon input line */
  #define	MAX_INPUT		  255	/* max bytes in terminal input */
@@ -7722,7 +7761,7 @@ index 5e937f103..635a7a6b8 100644
  };
  #endif
 diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
-index 4c343e462..835b3a712 100644
+index 968642745..82f68c809 100644
 --- a/newlib/libc/locale/locale.c
 +++ b/newlib/libc/locale/locale.c
 @@ -166,15 +166,18 @@ No supporting OS subroutines are required.
@@ -7816,7 +7855,7 @@ index 4c343e462..835b3a712 100644
  #else /* __HAVE_LOCALE_INFO__ */
    {
      { NULL, NULL },			/* LC_ALL */
-@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
+@@ -991,6 +1016,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
  
  const char *
  __locale_ctype_ptr (void)
@@ -7853,10 +7892,10 @@ index a0c80843a..efabdcfc4 100644
  
  /* Only access fixed "C" locale using this function.  Fake for !_MB_CAPABLE
 diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
-index e86afdf1c..007bd1567 100644
+index 577b7f9b3..ce3bb7b53 100644
 --- a/newlib/libc/machine/powerpc/Makefile.am
 +++ b/newlib/libc/machine/powerpc/Makefile.am
-@@ -10,7 +10,7 @@ noinst_LIBRARIES = lib.a
+@@ -8,7 +8,7 @@ noinst_LIBRARIES = lib.a
  
  AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
  
@@ -7866,19 +7905,19 @@ index e86afdf1c..007bd1567 100644
  lib_a_CFLAGS=$(AM_CFLAGS)
  lib_a_LIBADD = @extra_objs@
 diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
-index 73b0cc471..12044cb8a 100644
+index 46acda680..892a82288 100644
 --- a/newlib/libc/machine/powerpc/Makefile.in
 +++ b/newlib/libc/machine/powerpc/Makefile.in
-@@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
+@@ -74,7 +74,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
  lib_a_AR = $(AR) $(ARFLAGS)
 -am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
 +am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT)
  lib_a_OBJECTS = $(am_lib_a_OBJECTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp =
-@@ -196,7 +196,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+@@ -218,7 +218,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
  AM_CCASFLAGS = $(INCLUDES)
  noinst_LIBRARIES = lib.a
  AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
@@ -7887,9 +7926,9 @@ index 73b0cc471..12044cb8a 100644
  lib_a_CCASFLAGS = $(AM_CCASFLAGS)
  lib_a_CFLAGS = $(AM_CFLAGS)
  lib_a_LIBADD = @extra_objs@
-@@ -280,6 +280,12 @@ lib_a-setjmp.obj: setjmp.S
+@@ -302,6 +302,12 @@ lib_a-setjmp.obj: setjmp.S
  .c.obj:
- 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 	$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
 +lib_a-access.o: access.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c
@@ -7898,7 +7937,7 @@ index 73b0cc471..12044cb8a 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi`
 +
  lib_a-vfprintf.o: vfprintf.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
  
 diff --git a/newlib/libc/machine/powerpc/access.c b/newlib/libc/machine/powerpc/access.c
 new file mode 100644
@@ -8066,10 +8105,10 @@ index 95f1a7422..c797d2e64 100644
 +
  #endif
 diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
-index aa22a0e3a..93e672b6a 100644
+index 6d18a4443..01402f4de 100644
 --- a/newlib/libc/stdio/Makefile.in
 +++ b/newlib/libc/stdio/Makefile.in
-@@ -507,6 +507,7 @@ GENERAL_SOURCES = \
+@@ -527,6 +527,7 @@ GENERAL_SOURCES = \
  	rename.c			\
  	rewind.c			\
  	rget.c				\
@@ -8077,9 +8116,9 @@ index aa22a0e3a..93e672b6a 100644
  	scanf.c			\
  	sccl.c				\
  	setbuf.c			\
-@@ -1176,6 +1177,12 @@ lib_a-rget.o: rget.c
+@@ -1196,6 +1197,12 @@ lib_a-rget.o: rget.c
  lib_a-rget.obj: rget.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
  
 +lib_a-rmdir.o: rmdir.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.o `test -f 'rmdir.c' || echo '$(srcdir)/'`rmdir.c
@@ -8088,10 +8127,10 @@ index aa22a0e3a..93e672b6a 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi`
 +
  lib_a-scanf.o: scanf.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
  
 diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
-index 022992b8d..bdf4c7bb0 100644
+index 1ac551fed..d293b7b0e 100644
 --- a/newlib/libc/stdio/fopen.c
 +++ b/newlib/libc/stdio/fopen.c
 @@ -139,6 +139,9 @@ _fopen_r (struct _reent *ptr,
@@ -8105,73 +8144,80 @@ index 022992b8d..bdf4c7bb0 100644
    fp->_flags = flags;
    fp->_cookie = (void *) fp;
 diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
-index b358d2b4a..9cab2180e 100644
+index df8321461..eee4181cd 100644
 --- a/newlib/libc/stdio/fread.c
 +++ b/newlib/libc/stdio/fread.c
-@@ -225,7 +225,31 @@ _fread_r (struct _reent * ptr,
+@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
+ 	  int rc = 0;
+ 	  /* save fp buffering state */
+ 	  void *old_base = fp->_bf._base;
+-	  void * old_p = fp->_p;
+ 	  int old_size = fp->_bf._size;
+ 	  /* allow __refill to use user's buffer */
+ 	  fp->_bf._base = (unsigned char *) p;
+@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
+ 	  /* restore fp buffering back to original state */
+ 	  fp->_bf._base = old_base;
+ 	  fp->_bf._size = old_size;
+-	  fp->_p = old_p;
++	  fp->_p = old_base;
+ 	  resid -= fp->_r;
+ 	  p += fp->_r;
+ 	  fp->_r = 0;
+@@ -225,7 +224,29 @@ _fread_r (struct _reent * ptr,
  	  /* fp->_r = 0 ... done in __srefill */
  	  p += r;
  	  resid -= r;
 -	  if (__srefill_r (ptr, fp))
 +      int rc = 0;
 +
-+      if (resid>BUFSIZ)
++      if (resid>fp->_bf._size)
 +      {
 +        /* save fp buffering state */
 +        void *old_base = fp->_bf._base;
-+        void * old_p = fp->_p;
 +        int old_size = fp->_bf._size;
 +        /* allow __refill to use user's buffer */
 +        fp->_bf._base = (unsigned char *) p;
-+        fp->_bf._size = resid;
++        fp->_bf._size = resid - old_size;
 +        fp->_p = (unsigned char *) p;
 +        rc = __srefill_r (ptr, fp);
 +        /* restore fp buffering back to original state */
 +        fp->_bf._base = old_base;
 +        fp->_bf._size = old_size;
-+        fp->_p = old_p;
++        fp->_p = old_base;
 +        resid -= fp->_r;
 +        p += fp->_r;
-+        fp->_r = 0;
-+
-+      } else {
-+        rc = __srefill_r (ptr, fp);
++        //fp->_r = 0;
 +      }
-+    if (rc)
++        rc = __srefill_r (ptr, fp);
++
++	  if (rc)
  	    {
  	      /* no more input: return partial result */
  #ifdef __SCLE
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index 88413ce86..24029a6f7 100644
---- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2015 embedded brains GmbH
-+ * Copyright (c) 2018 Dave Murphy
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -25,14 +25,15 @@
-  */
- 
- #include <stdlib.h>
-+#include <malloc.h>
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
++++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
+ #include <reent.h>
+ #include <stdio.h>
 +#include <errno.h>
  
- void *
- aligned_alloc(size_t alignment, size_t size)
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
  {
--	void *p;
--	int error;
-+	if ((alignment !=0) && !(alignment & (alignment - 1 )) && !(size & (alignment - 1)))
-+		return memalign(alignment,size);
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
++  if (_unlink_r (ptr, filename) == -1) {
++    errno = 0;
++    if (_rmdir_r(ptr, filename) == -1)
++      return -1;
++  }
  
--	error = posix_memalign(&p, alignment, size);
--
--	return (error == 0 ? p : NULL);
-+	errno = EINVAL;
-+	return (void*)NULL;
+   return 0;
  }
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644

dkppc/scripts/build-crtls.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+export DEVKITPPC=$DEVKITPRO/devkitPPC
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+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 \
@@ -75,9 +78,6 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -91,15 +91,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 36" \
+	--prefix=$prefix \
+	--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
@@ -187,31 +189,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=9.1.0
-    BINUTILS_VER=2.32
-    NEWLIB_VER=3.1.0
-    GDB_VER=8.2.1
+    GCC_VER=12.2.0
+    BINUTILS_VER=2.39
+    NEWLIB_VER=4.2.0.20211231
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=8.4.0
-    BINUTILS_VER=2.32
-    MN_BINUTILS_VER=2.17
-    NEWLIB_VER=3.3.0
-    GDB_VER=8.2.1
+    GCC_VER=12.1.0
+    BINUTILS_VER=2.37
+    MN_BINUTILS_VER=2.24
+    NEWLIB_VER=4.2.0.20211231
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=9.2.0
+    GCC_VER=12.1.0
     BINUTILS_VER=2.32
-    NEWLIB_VER=3.1.0
-    GDB_VER=8.2.1
+    NEWLIB_VER=4.2.0.20211231
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf