ignore .xz files

use latest crtls & rules
add zstd to configure options
2026-08-21 01:44:16 -05:00 · 2021-04-29 22:53:42 +01:00 · 2021-04-29 22:53:42 +01:00 · 2021-04-29 22:53:42 +01:00 · 2021-04-29 22:53:42 +01:00 · 2021-04-29 22:53:42 +01:00
26 changed files with 805 additions and 1425 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ config.sh
 .devkitARM*
 .devkitPPC*
 .devkitA64*
+*.xz
 *.gz
 *.bz2
 *~
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,8 +1,9 @@
+
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 53-1
-#	devkitPPC release 35
-#	devkitA64 release 14
+#	devkitARM release 55
+#	devkitPPC release 38
+#	devkitA64 release 17
 #---------------------------------------------------------------------------------

 if [ 0 -eq 1 ] ; then
@@ -26,33 +27,13 @@ echo "https://github.com/devkitPro/buildscripts/pulls"
 echo


-GENERAL_TOOLS_VER=1.0.2

-GBATOOLS_VER=1.1.0
-DKARM_RULES_VER=1.0.0
-DKARM_CRTLS_VER=1.0.0
+DKARM_RULES_VER=1.2.1
+DKARM_CRTLS_VER=1.1.1

-DSTOOLS_VER=1.2.1
-GRIT_VER=0.8.15
-NDSTOOL_VER=2.1.1
-MMUTIL_VER=1.8.7
+DKPPC_RULES_VER=1.1.0

-DFU_UTIL_VER=0.9.1
-STLINK_VER=1.2.3
-
-GAMECUBE_TOOLS_VER=1.0.2
-WIILOAD_VER=0.5.1
-DKPPC_RULES_VER=1.0.0
-
-TOOLS3DS_VER=1.1.4
-LINK3DS_VER=0.5.2
-PICASSO_VER=2.7.0
-TEX3DS_VER=1.0.0
-
-GP32_TOOLS_VER=1.0.3
-LIBMIRKO_VER=0.9.8
-
-SWITCH_TOOLS_VER=1.4.1
+DKA64_RULES_VER=1.0.1

 OSXMIN=${OSXMIN:-10.9}

@@ -139,24 +120,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

@@ -202,33 +181,26 @@ 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
-
-	hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
-		dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
-		general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
-		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2
-		picasso-$PICASSO_VER.tar.bz2 tex3ds-$TEX3DS_VER.tar.bz2 3dslink-$LINK3DS_VER.tar.bz2"
-
-	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
-
-	hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
-
-	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 [ $VERSION -eq 3 ]; then
+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

-	hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
+	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"
 else
@@ -236,7 +208,7 @@ else
 fi

 cd "$SRCDIR"
-for archive in $archives $hostarchives
+for archive in $archives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
@@ -251,35 +223,21 @@ 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
-
-for archive in $hostarchives
-do
-	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
-	if [ ! -d $destdir ]; then
-		tar -xjf "$SRCDIR/$archive"
-	fi
-done
+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

-if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; then
- . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
+
+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

 cd $BUILDSCRIPTDIR

-if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
-	cp -v	$CROSSBINPATH//libwinpthread-1.dll $prefix/bin
-fi
-
 echo "stripping installed binaries"
 . ./strip_bins.sh

--- a/config.sh.sample
+++ b/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
 #---------------------------------------------------------------------------------
--- a/cross-build-i686-w64-mingw32.sh
+++ b/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
-
--- a/cross-build-x86_64-apple-darwin15.sh
+++ b/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
-
--- a/cross-build-x86_64-w64-mingw32.sh
+++ b/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
-
--- a/dka64/patches/gcc-11.1.0.patch
+++ b/dka64/patches/gcc-11.1.0.patch
@@ -1,10 +1,12 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index ddd3b8f4d9d..014df2e5a59 100644
+index 357b0bed067..6b1e254785a 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -985,6 +985,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -1090,7 +1090,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+ 	tmake_file="${tmake_file} aarch64/t-aarch64"
 	case $target in
 	aarch64-*-elf*)
+		default_use_cxa_atexit=yes
 		use_gcc_stdint=wrap
 +		tm_file="${tm_file} devkitpro.h"
 +		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
@@ -15,8 +17,23 @@ index ddd3b8f4d9d..014df2e5a59 100644
 		;;
         aarch64-*-fuchsia*)
                 tm_file="${tm_file} fuchsia.h"
+diff --git a/gcc/config.host b/gcc/config.host
+index 0a02c33cc80..38f7adc655e 100644
+--- a/gcc/config.host
+++ b/gcc/config.host
+@@ -251,6 +251,10 @@ case ${host} in
+     host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
+     host_lto_plugin_soname=liblto_plugin.dll
+     ;;
+  aarch64-*-darwin*)
+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
+    ;;
+   i[34567]86-*-darwin* | x86_64-*-darwin*)
+     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
+     host_xmake_file="${host_xmake_file} i386/x-darwin"
 diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index bbebd0ef029..8f38510402f 100644
+index e986149e400..9264d53f32c 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
@@ -22,6 +22,7 @@
@@ -28,7 +45,7 @@ index bbebd0ef029..8f38510402f 100644
 #define ENDFILE_SPEC \
   " crtend%O%s crtn%O%s " \
 diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
-index 4b07d296a11..037985f1d86 100644
+index af3b7364a74..6df7a0dc8a1 100644
 --- a/gcc/config/aarch64/aarch64-opts.h
 +++ b/gcc/config/aarch64/aarch64-opts.h
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
@@ -45,10 +62,10 @@ index 4b07d296a11..037985f1d86 100644
    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
+index 12625a4bee3..4353e2658a1 100644
 --- a/gcc/config/aarch64/aarch64.c
 +++ b/gcc/config/aarch64/aarch64.c
-@@ -13186,8 +13186,24 @@ aarch64_load_tp (rtx target)
+@@ -18053,8 +18053,24 @@ aarch64_load_tp (rtx target)
       || !register_operand (target, Pmode))
     target = gen_reg_rtx (Pmode);
 
@@ -76,10 +93,10 @@ index 6b25d9cbfae..39c7026a90c 100644
 }
 
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index fc6df970c2e..705c6de868f 100644
+index bfffbcd6abf..814de8c2918 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -1006,6 +1006,10 @@ typedef struct
+@@ -1191,6 +1191,10 @@ typedef struct
 /* Check TLS Descriptors mechanism is selected.  */
 #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
 
@@ -90,11 +107,20 @@ index fc6df970c2e..705c6de868f 100644
 extern enum aarch64_code_model aarch64_cmodel;
 
 /* When using the tiny addressing model conditional and unconditional branches
+@@ -1236,7 +1240,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
+ #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
+   { "rewrite_mcpu", aarch64_rewrite_mcpu },
+ 
+-#if defined(__aarch64__)
+#if 0 // defined(__aarch64__)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ #define HAVE_LOCAL_CPU_DETECT
+ # define EXTRA_SPEC_FUNCTIONS						\
 diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index 5a1894063a1..7c9d9452659 100644
+index abfd8452674..8b9f4423adb 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -6583,11 +6583,22 @@
+@@ -6771,11 +6771,22 @@
 (define_insn "aarch64_load_tp_hard"
   [(set (match_operand:DI 0 "register_operand" "=r")
 	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -120,10 +146,10 @@ index 5a1894063a1..7c9d9452659 100644
 ;; instructions in the TLS stubs, in order to enable linker relaxation.
 ;; Therefore we treat the stubs as an atomic sequence.
 diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
-index 7719c3b6352..cd32a639b16 100644
+index 32191cf1acf..49b03937bdd 100644
 --- a/gcc/config/aarch64/aarch64.opt
 +++ b/gcc/config/aarch64/aarch64.opt
-@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
+@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
 EnumValue
 Enum(aarch64_tls_size) String(48) Value(48)
 
@@ -143,24 +169,81 @@ 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.
+@@ -260,7 +275,7 @@ TargetVariable
+ long aarch64_stack_protector_guard_offset = 0
+ 
+ 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 --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
+new file mode 100644
+index 00000000000..92c38b0b9db
+--- /dev/null
+++ b/gcc/config/aarch64/host-aarch64-darwin.c
+@@ -0,0 +1,32 @@
+/* i386-darwin host-specific hook definitions.
+   Copyright (C) 2003-2021 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#define IN_TARGET_CODE 1
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "hosthooks.h"
+#include "hosthooks-def.h"
+#include "config/host-darwin.h"
+
+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
+   to include config/host-darwin.h.  */
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index ee471f8983f..aedaefdd62d 100644
+index 7e1606c47ac..3b650075724 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
+@@ -165,8 +165,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
+ 		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
 
-comma=,
+ 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
+ 
+ insn-conditions.md: s-check-sve-md
+ s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
+diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
+new file mode 100644
+index 00000000000..6d788d5e89c
+--- /dev/null
+++ b/gcc/config/aarch64/x-darwin
+@@ -0,0 +1,3 @@
+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
 diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
 index 00000000000..11ba0f5ab1c
@@ -233,11 +316,27 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
+diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+index 360a280b23a..2c03947999a 100644
+--- a/gcc/config/i386/host-mingw32.c
+++ b/gcc/config/i386/host-mingw32.c
+@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
+ static inline void w32_error(const char*, const char*, int, const char*);
+ 
+ /* FIXME: Is this big enough?  */
+#if __MINGW64__
+static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
+#else
+ static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
+#endif
+ 
+ /* Granularity for reserving address space.  */
+ static size_t va_granularity = 0x10000;
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4f57765b012..2899202cc05 100644
+index 7837553958b..69d7a798e2e 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -794,6 +794,11 @@ proper position among the other output files.  */
+@@ -853,6 +853,11 @@ proper position among the other output files.  */
 #endif
 #endif
 
@@ -249,7 +348,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;
+@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -257,7 +356,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[] =
+@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -266,19 +365,20 @@ index 4f57765b012..2899202cc05 100644
   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
+index 675930db043..bdfd6f6b0bb 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -325,7 +325,7 @@ register_tm_clones (void)
 
- /* 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,
+-#if DEFAULT_USE_CXA_ATEXIT
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
 diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 67826419882..d9f01c6c371 100644
+index cca3f294b7b..deffea4107b 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -291,10 +391,10 @@ index 67826419882..d9f01c6c371 100644
 #define GTHREAD_USE_WEAK 0
 #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 1deacb80ca2..0de11c15a3a 100644
+index 40a41ef2a1c..4d06c6f9953 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}
+@@ -1347,6 +1347,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -303,10 +403,10 @@ index 1deacb80ca2..0de11c15a3a 100644
 	    < $< > $@
 
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index bc475c6dd90..bfa3e71898a 100644
+index fcd2b5b2d40..c034367994a 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}
+@@ -1830,6 +1830,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -314,3 +414,43 @@ index bc475c6dd90..bfa3e71898a 100644
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 
+diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
+index 0413e3b7c25..ff5f8bbe1a1 100644
+--- a/libstdc++-v3/include/c_compatibility/fenv.h
+++ b/libstdc++-v3/include/c_compatibility/fenv.h
+@@ -26,6 +26,10 @@
+  *  This is a Standard C++ Library header.
+  */
+ 
+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+# include_next <fenv.h>
+#else
+
+ #ifndef _GLIBCXX_FENV_H
+ #define _GLIBCXX_FENV_H 1
+ 
+@@ -79,3 +83,5 @@ namespace std
+ #endif // C++11
+ 
+ #endif // _GLIBCXX_FENV_H
+
+#endif // __cplusplus
+diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
+index 0b0ec35a837..d24cb1a3c81 100644
+--- a/libstdc++-v3/include/c_global/cfenv
+++ b/libstdc++-v3/include/c_global/cfenv
+@@ -37,9 +37,11 @@
+ 
+ #include <bits/c++config.h>
+ 
+-#if _GLIBCXX_HAVE_FENV_H
+-# include <fenv.h>
+-#endif
+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
+// wrapper that might already be installed later in the include search path.
+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+#include_next <fenv.h>
+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ 
+ #ifdef _GLIBCXX_USE_C99_FENV_TR1
+ 
--- a/dka64/patches/gdb-8.2.1.patch
+++ b/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.  */
- 
--- a/dka64/patches/newlib-4.1.0.patch
+++ b/dka64/patches/newlib-4.1.0.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 1a4033dce..ba7aea7b0 100755
+index 816b9c4b8..b79edb6c8 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2609,6 +2609,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -12,7 +12,7 @@ index 1a4033dce..ba7aea7b0 100755
 
 ac_config_commands="$ac_config_commands depfiles"
 diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 41843eed1..dc0e2a5fd 100644
+index 4111724e1..0e44d885e 100644
 --- a/libgloss/configure.in
 +++ b/libgloss/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
@@ -23,7 +23,7 @@ index 41843eed1..dc0e2a5fd 100644
 
 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
@@ -8739,10 +8739,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 6c49cb750..610b63e81 100644
+index 1ddbb6c76..f096346dc 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -659,13 +659,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -687,13 +687,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	syscall_dir=syscalls
 	;;
   aarch64*-*-*)
@@ -8768,6 +8768,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 +8857,10 @@ index 000000000..a71a5d847
 +
 +#endif
 diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
-index 893a5d064..da4b3a1ee 100644
+index ba1a8a17e..f521cad89 100644
 --- a/newlib/libc/include/math.h
 +++ b/newlib/libc/include/math.h
-@@ -416,7 +416,7 @@ extern float hypotf (float, float);
+@@ -426,7 +426,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. */
@@ -9092,10 +9118,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 +9133,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 4bc8d29bf..35c05e6af 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
@@ -4,6 +4,9 @@
@@ -9189,7 +9215,7 @@ 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 218807178..93294ad2e 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
@@ -330,6 +330,16 @@ extern "C" {
@@ -9342,7 +9368,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 +9382,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 +9527,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 74b70e9c0..d8c5410ec 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 +9553,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 +9562,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 8769112b0..5526e59ee 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 +9619,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 +9656,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 +9768,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)
@@ -10024,7 +10063,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 +10075,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 +10100,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 +10114,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 +10127,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 @@
@@ -10084,10 +10140,10 @@ index 53694aa1c..79a8f4666 100644
 #endif
 
 diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
-index c4bf2dbe3..d756df37d 100644
+index 1aaf05aa4..b67182a79 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 +10152,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) {
+@@ -1434,7 +1436,7 @@ reswitch:	switch (ch) {
 string:
 #endif
 			sign = '\0';
@@ -10105,7 +10161,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:
+@@ -1444,7 +1446,7 @@ string:
 				size = ((unsigned) prec > 6U) ? 6 : prec;
 			}
 			else
@@ -10115,7 +10171,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 994cee7fc..5d1d0a1cd 100644
 --- a/newlib/libc/stdio/vfscanf.c
 +++ b/newlib/libc/stdio/vfscanf.c
@@ -74,6 +74,8 @@ These are GNU extensions.
@@ -10142,7 +10198,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 f00d41a09..7e290ee8d 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
@@ -74,6 +74,9 @@ PORTABILITY
@@ -10203,37 +10259,18 @@ index 699831f13..1e6d2e612 100644
 	$(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
+index feb22c24b..3dae0c9a9 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 @@
-  */
+@@ -28,6 +28,8 @@
 
+ #include <reent.h>
 #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;
- }
+ aligned_alloc (size_t align, size_t size)
 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 +10610,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))
- 
--- a/dka64/scripts/build-crtls.sh
+++ 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
--- a/dka64/scripts/build-gcc.sh
+++ b/dka64/scripts/build-gcc.sh
@@ -59,14 +59,17 @@ then
 		--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" \
+                --disable-tm-clone-registry \
+                --disable-__cxa_atexit \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 17" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+		$EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -148,42 +151,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
--- a/dka64/scripts/build-tools.sh
+++ b/dka64/scripts/build-tools.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-cd $BUILDDIR
-
-for archive in $hostarchives
-do
-	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
-	cd $BUILDDIR/$dir
-	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
-		touch configured
-	fi
-	if [ ! -f built ]; then
-		$MAKE || { echo "error building $dir"; exit 1; }
-		touch built
-	fi
-	if [ ! -f installed ]; then
-		$MAKE install || { echo "error installing $dir"; exit 1; }
-		touch installed
-	fi
-done
--- a/dkarm-eabi/patches/gcc-10.2.0.patch
+++ b/dkarm-eabi/patches/gcc-10.2.0.patch
@@ -1,8 +1,8 @@
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 3a55f6ac6d2..1a16dcc1c74 100644
+index 728be500b80..74c1abad635 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
-@@ -352,7 +352,7 @@ begin arch armv6k
+@@ -392,7 +392,7 @@ begin arch armv6k
  tune for mpcore
  tune flags CO_PROC
  base 6K
@@ -12,15 +12,9 @@ index 3a55f6ac6d2..1a16dcc1c74 100644
  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
+index 3d92bd23322..35cefcde676 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
-@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2019 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
- #
- # This file is part of GCC.
- #
@@ -16,111 +16,14 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
@@ -56,7 +50,7 @@ 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
 -
 -# No floating point variants, require thumb1 softfp
 -all_nofp_t	:= armv6-m armv6s-m armv8-m.base
@@ -139,7 +133,7 @@ index 8911d489f14..b1976386bab 100644
 -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
+index 9ad2947505f..1790caa8e88 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
@@ -29,7 +29,7 @@
@@ -158,11 +152,53 @@ 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/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+index 250fef59b55..36b2239aa5d 100644
+--- a/gcc/config/i386/host-mingw32.c
+++ b/gcc/config/i386/host-mingw32.c
+@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
+ 
+ static inline void w32_error(const char*, const char*, int, const char*);
+ 
+-/* FIXME: Is this big enough?  */
+-static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
+-
+ /* Granularity for reserving address space.  */
+ static size_t va_granularity = 0x10000;
+ 
+@@ -88,9 +85,6 @@ static void *
+ mingw32_gt_pch_get_address (size_t size, int)
+ {
+   void* res;
+-  size = (size + va_granularity - 1) & ~(va_granularity - 1);
+-  if (size > pch_VA_max_size)
+-    return NULL;
+ 
+   /* FIXME: We let system determine base by setting first arg to NULL.
+      Allocating at top of available address space avoids unnecessary
+@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
+      If we allocate at bottom we need to reserve the address as early
+      as possible and at the same point in each invocation. */
+  
+-  res = VirtualAlloc (NULL, pch_VA_max_size,
+  res = VirtualAlloc (NULL, size,
+ 		      MEM_RESERVE | MEM_TOP_DOWN,
+ 		      PAGE_NOACCESS);
+   if (!res)
+@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
+ 
+   /* Offset must be also be a multiple of allocation granularity for
+      this to work.  We can't change the offset. */ 
+-  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
+  if ((offset & (va_granularity - 1)) != 0)
+     return -1;
+ 
+ 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4f57765b012..2899202cc05 100644
+index 9f790db0daf..97f52d0b893 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -794,6 +794,11 @@ proper position among the other output files.  */
+@@ -793,6 +793,11 @@ proper position among the other output files.  */
 #endif
 #endif
 
@@ -174,7 +210,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;
+@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -182,7 +218,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[] =
+@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -201,15 +237,15 @@ index dddddc7c444..c2502597953 100644
 -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
+index 3f769a1c660..e005d8304b7 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -325,7 +325,7 @@ register_tm_clones (void)
 
- /* 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
--- a/dkarm-eabi/patches/gdb-8.2.1.patch
+++ b/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.  */
- 
--- a/dkarm-eabi/patches/newlib-3.3.0.patch
+++ b/dkarm-eabi/patches/newlib-3.3.0.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 1a4033dce..ba7aea7b0 100755
+index 0d2918cee..bccfb07b4 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -12,7 +12,7 @@ index 1a4033dce..ba7aea7b0 100755
 
 ac_config_commands="$ac_config_commands depfiles"
 diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 41843eed1..dc0e2a5fd 100644
+index f38d5298e..509c31071 100644
 --- a/libgloss/configure.in
 +++ b/libgloss/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
@@ -23,7 +23,7 @@ index 41843eed1..dc0e2a5fd 100644
 
 if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
-@@ -190,6 +191,7 @@ dnl fi
+@@ -193,6 +194,7 @@ dnl fi
 if test "${config_libnosys}" = "true"; then
   AC_CONFIG_SUBDIRS([libnosys])
 fi
@@ -7408,10 +7408,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 6c49cb750..6a5e1c78d 100644
+index a84c0c80a..29fb7ed24 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -666,6 +666,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -687,6 +687,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	syscall_dir=syscalls
 	default_newlib_io_long_long="yes"
 	;;
@@ -7440,7 +7440,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 d746b15fc..80169d9b7 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
@@ -4,6 +4,9 @@
@@ -7520,7 +7520,7 @@ 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 218807178..c9efd7d03 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
@@ -330,6 +330,9 @@ extern "C" {
@@ -7651,11 +7651,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 74b70e9c0..d8c5410ec 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 +7678,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 +7687,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 8769112b0..5526e59ee 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 );
 
@@ -8017,7 +8031,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 b358d2b4a..a3e597fd2 100644
 --- a/newlib/libc/stdio/fread.c
 +++ b/newlib/libc/stdio/fread.c
@@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
@@ -8029,7 +8043,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,31 @@ _fread_r (struct _reent * ptr,
 	  /* fp->_r = 0 ... done in __srefill */
 	  p += r;
 	  resid -= r;
@@ -8037,11 +8068,10 @@ 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;
@@ -8051,7 +8081,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;
@@ -8122,7 +8152,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 ffb6cc85b..db33d4f29 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
@@ -74,6 +74,9 @@ PORTABILITY
@@ -8276,16 +8306,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))
- 
--- a/dkarm-eabi/scripts/build-crtls.sh
+++ 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
+
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/dkarm-eabi/scripts/build-gcc.sh
@@ -64,7 +64,9 @@ 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 55" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
@@ -150,35 +152,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
-
--- a/dkarm-eabi/scripts/build-tools.sh
+++ b/dkarm-eabi/scripts/build-tools.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-cd $BUILDDIR
-
-for archive in $hostarchives
-do
-	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
-	cd $BUILDDIR/$dir
-	if [ ! -f configured ]; then
-		CPPFLAGS="$cppflags $CPPFLAGS" ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
-		touch configured
-	fi
-	if [ ! -f built ]; then
-		$MAKE || { echo "error building $dir"; exit 1; }
-		touch built
-	fi
-	if [ ! -f installed ]; then
-		$MAKE install || { echo "error installing $dir"; exit 1; }
-		touch installed
-	fi
-done
--- a/dkppc/patches/binutils-2.34.patch
+++ b/dkppc/patches/binutils-2.34.patch
@@ -0,0 +1,12 @@
+diff -NBaur binutils-2.34/opcodes/ppc-opc.c binutils-2.34-ppc/opcodes/ppc-opc.c
+--- binutils-2.34/opcodes/ppc-opc.c	2020-01-18 13:55:49.000000000 +0000
+++ binutils-2.34-ppc/opcodes/ppc-opc.c	2020-05-22 10:47:37.900308413 +0000
+@@ -3747,7 +3747,7 @@
+ #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
+ 		 | PPC_OPCODE_TITAN)
+ #define BOOKE	PPC_OPCODE_BOOKE
+-#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
+ #define PPCE300 PPC_OPCODE_E300
+ #define PPCSPE	PPC_OPCODE_SPE
+ #define PPCSPE2 PPC_OPCODE_SPE2
--- a/dkppc/patches/gcc-10.2.0.patch
+++ b/dkppc/patches/gcc-10.2.0.patch
@@ -1,30 +1,59 @@
 diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f..814104f 100644
+index 4b937306ad0..bfd0375bd60 100644
 --- a/config/gthr.m4
 +++ b/config/gthr.m4
-@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
- [
+@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
 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 7af8e02..dc58cab 100644
--- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2464,7 +2464,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/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+index 250fef59b55..36b2239aa5d 100644
+--- a/gcc/config/i386/host-mingw32.c
+++ b/gcc/config/i386/host-mingw32.c
+@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
+ 
+ static inline void w32_error(const char*, const char*, int, const char*);
+ 
+-/* FIXME: Is this big enough?  */
+-static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
+-
+ /* Granularity for reserving address space.  */
+ static size_t va_granularity = 0x10000;
+ 
+@@ -88,9 +85,6 @@ static void *
+ mingw32_gt_pch_get_address (size_t size, int)
+ {
+   void* res;
+-  size = (size + va_granularity - 1) & ~(va_granularity - 1);
+-  if (size > pch_VA_max_size)
+-    return NULL;
+ 
+   /* FIXME: We let system determine base by setting first arg to NULL.
+      Allocating at top of available address space avoids unnecessary
+@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
+      If we allocate at bottom we need to reserve the address as early
+      as possible and at the same point in each invocation. */
+  
+-  res = VirtualAlloc (NULL, pch_VA_max_size,
+  res = VirtualAlloc (NULL, size,
+ 		      MEM_RESERVE | MEM_TOP_DOWN,
+ 		      PAGE_NOACCESS);
+   if (!res)
+@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
+ 
+   /* Offset must be also be a multiple of allocation granularity for
+      this to work.  We can't change the offset. */ 
+-  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
+  if ((offset & (va_granularity - 1)) != 0)
+     return -1;
+ 
+ 
 diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index f46e797..fd39e64 100644
+index 2e086f16de9..1c27c6467bc 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
@@ -37,18 +66,18 @@ index f46e797..fd39e64 100644
 
 #define SIG_ATOMIC_TYPE "int"
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index b83b304..b85359e 100644
+index 132ca20fd7d..119ee5bbc8c 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
+@@ -196,6 +196,7 @@ ASM_OPT_ANY
 /* -mcpu=native handling only makes sense with compiler running on
    an PowerPC chip.  If changing this condition, also change
    the condition in driver-rs6000.c.  */
-@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+#if 0
+ #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
+ /* In driver-rs6000.c.  */
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -207,6 +208,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 #else
 #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
 #endif
@@ -57,42 +86,11 @@ index b83b304..b85359e 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 4d69c1d..af2d7b5 100644
--- a/gcc/config/rs6000/rs6000.md
-+++ b/gcc/config/rs6000/rs6000.md
-@@ -5625,19 +5625,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 bb19d0d..74d1e47 100644
+index 9ade72114e9..cede792d3a7 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
 
 /* Default starting address if specified.  */
 #define LINK_START_SPEC "\
@@ -105,7 +103,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(link_start_yellowknife) ; \
   mmvme        : %(link_start_mvme)        ; \
   msim         : %(link_start_sim)         ; \
-@@ -596,7 +600,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
 
 /* Any specific OS flags.  */
 #define LINK_OS_SPEC "\
@@ -115,7 +113,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(link_os_yellowknife) ; \
   mmvme        : %(link_os_mvme)        ; \
   msim         : %(link_os_sim)         ; \
-@@ -614,7 +619,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
 /* Override rs6000.h definition.  */
 #undef	CPP_SPEC
 #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -127,7 +125,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(cpp_os_yellowknife) ; \
   mmvme        : %(cpp_os_mvme)        ; \
   msim         : %(cpp_os_sim)         ; \
-@@ -628,7 +636,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
 
 #undef	STARTFILE_SPEC
 #define	STARTFILE_SPEC "\
@@ -139,7 +137,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(startfile_yellowknife) ; \
   mmvme        : %(startfile_mvme)        ; \
   msim         : %(startfile_sim)         ; \
-@@ -642,7 +653,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
 
 #undef	LIB_SPEC
 #define	LIB_SPEC "\
@@ -149,7 +147,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(lib_yellowknife) ; \
   mmvme        : %(lib_mvme)        ; \
   msim         : %(lib_sim)         ; \
-@@ -652,11 +664,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
   mcall-openbsd: %(lib_openbsd)     ; \
                : %(lib_default)     }"
 
@@ -164,7 +162,7 @@ index bb19d0d..74d1e47 100644
   myellowknife : %(endfile_yellowknife) ; \
   mmvme        : %(endfile_mvme)        ; \
   msim         : %(endfile_sim)         ; \
-@@ -672,16 +685,27 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
 
 /* Motorola ADS support.  */
 #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -192,7 +190,7 @@ index bb19d0d..74d1e47 100644
 
 /* Motorola Yellowknife support.  */
 #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -882,6 +906,7 @@ ncrtn.o%s"
+@@ -851,6 +875,7 @@ ncrtn.o%s"
 #undef	SUBTARGET_EXTRA_SPECS
 #define	SUBTARGET_EXTRA_SPECS						\
   { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -200,7 +198,7 @@ index bb19d0d..74d1e47 100644
   { "lib_ads",			LIB_ADS_SPEC },				\
   { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
   { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -891,6 +916,7 @@ ncrtn.o%s"
+@@ -860,6 +885,7 @@ ncrtn.o%s"
   { "lib_netbsd",		LIB_NETBSD_SPEC },			\
   { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
   { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -208,7 +206,7 @@ index bb19d0d..74d1e47 100644
   { "startfile_ads",		STARTFILE_ADS_SPEC },			\
   { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
   { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -900,6 +926,7 @@ ncrtn.o%s"
+@@ -869,6 +895,7 @@ ncrtn.o%s"
   { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
   { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
   { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -216,7 +214,7 @@ index bb19d0d..74d1e47 100644
   { "endfile_ads",		ENDFILE_ADS_SPEC },			\
   { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
   { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -911,7 +938,11 @@ ncrtn.o%s"
+@@ -880,7 +907,11 @@ ncrtn.o%s"
   { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
   { "link_shlib",		LINK_SHLIB_SPEC },			\
   { "link_start",		LINK_START_SPEC },			\
@@ -228,7 +226,7 @@ index bb19d0d..74d1e47 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"
+@@ -890,6 +921,7 @@ ncrtn.o%s"
   { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
   { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
   { "link_os",			LINK_OS_SPEC },				\
@@ -236,7 +234,7 @@ index bb19d0d..74d1e47 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"
+@@ -901,6 +933,9 @@ ncrtn.o%s"
   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
   { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
@@ -247,7 +245,7 @@ index bb19d0d..74d1e47 100644
   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
 diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
-index 34fea0d..084a8ae 100644
+index b49ba261f3c..4eda763dfca 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
@@ -124,6 +124,26 @@ mads
@@ -278,10 +276,10 @@ index 34fea0d..084a8ae 100644
 Target RejectNegative
 Link with libyk.a, libc.a and crt0.o.
 diff --git a/gcc/configure b/gcc/configure
-index 6121e16..6584112 100755
+index eb6061c1631..4c6e993ca3a 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -11692,7 +11692,7 @@ case ${enable_threads} in
+@@ -12208,7 +12208,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
@@ -291,10 +289,10 @@ index 6121e16..6584112 100755
     target_thread_file=${enable_threads}
     ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc6..c42b3ef 100644
+index 715fcba0482..779743b69ee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1611,7 +1611,7 @@ case ${enable_threads} in
+@@ -1800,7 +1800,7 @@ case ${enable_threads} in
     # default
     target_thread_file='single'
     ;;
@@ -304,7 +302,7 @@ index b066cc6..c42b3ef 100644
     target_thread_file=${enable_threads}
     ;;
 diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
-index ba2b262..8d86610 100644
+index 260fe4d1af6..664808cd19c 100644
 --- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
@@ -24,7 +24,7 @@
@@ -322,7 +320,7 @@ index ba2b262..8d86610 100644
 #endif
 +#endif
 diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
-index 077e33f..b7be68b 100644
+index 7e1d5c5df98..2c62480d165 100644
 --- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
@@ -24,7 +24,7 @@
@@ -341,10 +339,10 @@ index 077e33f..b7be68b 100644
 +#endif
 diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
 new file mode 100644
-index 0000000..94d6ba9
+index 00000000000..26180aa7f36
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.c
-@@ -0,0 +1,349 @@
+@@ -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 +368,306 @@ index 0000000..94d6ba9
 +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 0000000..281c19d
+index 00000000000..72ecf82ab83
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.h
-@@ -0,0 +1,185 @@
+@@ -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 +721,44 @@ index 0000000..281c19d
 +#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);
@@ -886,7 +856,7 @@ index 0000000..281c19d
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
 diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
-index fb812d3..7f6669d 100644
+index fb812d3801f..7f6669d530f 100644
 --- a/libgcc/config/rs6000/t-ppccomm
 +++ b/libgcc/config/rs6000/t-ppccomm
@@ -1,4 +1,5 @@
@@ -896,38 +866,39 @@ index fb812d3..7f6669d 100644
 
 # This can't end up in shared libgcc
 diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f87..c6f93f8 100644
+index 26bf75789e0..1f663d2cfb0 100755
 --- a/libgcc/configure
 +++ b/libgcc/configure
-@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
- 
+@@ -5640,6 +5640,7 @@ tm_file="${tm_file_}"
 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 5e89445..f234745 100644
+index 3f769a1c660..e005d8304b7 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -325,7 +325,7 @@ register_tm_clones (void)
 
- /* 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,
+-#if DEFAULT_USE_CXA_ATEXIT
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 5535bfa..9f86d5d 100755
+index 9f9c5a2419a..c9bb6c548be 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -15180,6 +15180,7 @@ $as_echo "$target_thread_file" >&6; }
- 
+@@ -15637,6 +15637,7 @@ $as_echo "$target_thread_file" >&6; }
 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 ;;
--- a/dkppc/patches/newlib-3.3.0.patch
+++ b/dkppc/patches/newlib-3.3.0.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 1a4033dce..ba7aea7b0 100755
+index 0d2918cee..bccfb07b4 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -12,7 +12,7 @@ index 1a4033dce..ba7aea7b0 100755
 
 ac_config_commands="$ac_config_commands depfiles"
 diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 41843eed1..689e8b3ad 100644
+index f38d5298e..db6b33ab8 100644
 --- a/libgloss/configure.in
 +++ b/libgloss/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
@@ -33,7 +33,7 @@ index 41843eed1..689e8b3ad 100644
 case "${target}" in
   aarch64*-*-*)
 	AC_CONFIG_SUBDIRS(aarch64)
-@@ -191,6 +195,10 @@ if test "${config_libnosys}" = "true"; then
+@@ -194,6 +198,10 @@ if test "${config_libnosys}" = "true"; then
   AC_CONFIG_SUBDIRS([libnosys])
 fi
 
@@ -46,7 +46,7 @@ index 41843eed1..689e8b3ad 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);
@@ -622,10 +622,10 @@ index 000000000..b6cdfaeb8
 +m4_include([../acinclude.m4])
 diff --git a/libgloss/libsysbase/build_argv.c b/libgloss/libsysbase/build_argv.c
 new file mode 100644
-index 000000000..3ca95d5b6
+index 000000000..a969a0482
 --- /dev/null
 +++ b/libgloss/libsysbase/build_argv.c
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +struct __argv {
 +	int argvMagic;
 +	char *commandLine;
@@ -652,10 +652,11 @@ index 000000000..3ca95d5b6
 +	} while (data < end);
 +
 +	*end = '\0';						// Force NULL terminator for last arg
+	argv[argCount] = 0;                                     // Force NULL terminator for argv
 +
 +	argstruct->argv = argv;
 +	argstruct->argc = argCount;
-+	argstruct->endARGV = &argv[argCount];
+	argstruct->endARGV = &argv[argCount + 1];
 +}
 diff --git a/libgloss/libsysbase/chdir.c b/libgloss/libsysbase/chdir.c
 new file mode 100644
@@ -902,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 @@
@@ -912,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;
@@ -922,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;
@@ -932,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;
@@ -5937,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 @@
@@ -5960,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;
@@ -6517,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 @@
@@ -6527,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;
@@ -6710,7 +6711,7 @@ index 000000000..2692a2997
 +}
 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 @@
@@ -6730,8 +6731,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;
@@ -6921,34 +6922,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;
@@ -6956,8 +6939,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;
@@ -6965,8 +6948,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;
@@ -6974,22 +6957,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
@@ -7389,10 +7372,10 @@ index 000000000..bd25d775d
 +	exit ( main(__system_argv->argc,__system_argv->argv) );
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 6c49cb750..f30edc1a3 100644
+index a84c0c80a..0921e00be 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -832,7 +832,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -853,7 +853,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
 	;;
@@ -7470,7 +7453,7 @@ index a3fb5c02c..adb8e1083 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 218807178..c9efd7d03 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
@@ -330,6 +330,9 @@ extern "C" {
@@ -7485,10 +7468,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..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__
@@ -7523,6 +7506,7 @@ index 000000000..8b6d8da30
 +    void *dirStruct;
 +} DIR_ITER;
 +
+
 +typedef struct {
 +	const char *name;
 +	size_t structSize;
@@ -7561,23 +7545,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);
@@ -7598,10 +7590,10 @@ index 000000000..8b6d8da30
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 6e55e1c1f..6e0c1c9cf 100644
+index 74b70e9c0..d8c5410ec 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 */
@@ -7610,7 +7602,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
@@ -7619,10 +7611,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 8769112b0..5526e59ee 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 );
 
@@ -8104,39 +8096,54 @@ 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 b358d2b4a..78bb0df30 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
--- a/dkppc/scripts/build-crtls.sh
+++ b/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
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -40,6 +40,9 @@ 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

@@ -97,7 +100,7 @@ then
 	--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 35" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 38" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
        CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
@@ -187,31 +190,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
-
--- a/dkppc/scripts/build-tools.sh
+++ b/dkppc/scripts/build-tools.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-cd $BUILDDIR
-
-for archive in $hostarchives
-do
-	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
-	cd $BUILDDIR/$dir
-	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
-		touch configured
-	fi
-	if [ ! -f built ]; then
-		$MAKE || { echo "error building $archive"; exit 1; }
-		touch built
-	fi
-	if [ ! -f installed ]; then
-		$MAKE install || { echo "error installing $archive"; exit 1; }
-		touch installed
-	fi
-done
--- a/select_toolchain.sh
+++ b/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=10.2.0
+    BINUTILS_VER=2.34
+    NEWLIB_VER=3.3.0
    basedir='dkarm-eabi'
    package=devkitARM
    target=arm-none-eabi
    toolchain=DEVKITARM
  ;;
  "2" )
-    GCC_VER=8.3.0
-    BINUTILS_VER=2.32
+    GCC_VER=10.2.0
+    BINUTILS_VER=2.34
    MN_BINUTILS_VER=2.17
-    NEWLIB_VER=3.1.0
-    GDB_VER=8.2.1
+    NEWLIB_VER=3.3.0
    basedir='dkppc'
    package=devkitPPC
    target=powerpc-eabi
    toolchain=DEVKITPPC
  ;;
  "3" )
-    GCC_VER=9.2.0
+    GCC_VER=11.1.0
    BINUTILS_VER=2.32
-    NEWLIB_VER=3.1.0
-    GDB_VER=8.2.1
+    NEWLIB_VER=4.1.0
    basedir='dka64'
    package=devkitA64
    target=aarch64-none-elf
--- a/strip_bins.sh
+++ b/strip_bins.sh
Author	SHA1	Message	Date
Dave Murphy	d2c48d04c2	ignore .xz files	2021-04-29 22:53:42 +01:00
Dave Murphy	289d6a6aa0	use latest crtls & rules	2021-04-29 22:53:42 +01:00
Dave Murphy	c33f389df1	add zstd to configure options	2021-04-29 22:53:42 +01:00
Dave Murphy	2938af4ed5	add isl to configure options	2021-04-29 22:53:42 +01:00
Dave Murphy	0f4422c92c	devkitA64: allow external gcc config params	2021-04-29 22:53:42 +01:00
Dave Murphy	dc5b7bb5a6	remove cross build scripts	2021-04-29 22:53:42 +01:00
Dave Murphy	a87f68d4dd	devkitA64: update gcc to 11.1.0	2021-04-29 22:53:26 +01:00
Dave Murphy	a9b611e134	dlls no longer required	2021-04-27 16:49:40 +01:00
Dave Murphy	6015da5cab	devkitA64: update newlib to 4.1.0	2021-04-27 16:49:31 +01:00
Dave Murphy	6a74f83616	devkitPPC: use modern config.sub for mn10200 binutils	2020-07-25 14:58:45 +01:00
Dave Murphy	953cf2a761	devkitPPC: update gcc to 10.2.0, next release is r38	2020-07-25 13:10:46 +01:00
Dave Murphy	60efdbd109	devkitPPC: stop building gdb here	2020-07-25 11:13:00 +01:00
Dave Murphy	ef789eddb7	don't download crtls & rules archives if not building them	2020-07-25 03:45:56 +01:00
Dave Murphy	502f832a5b	fixup rules archive downloading	2020-07-25 03:29:50 +01:00
Dave Murphy	848924d332	devkitARM: update rules to 1.2.0	2020-07-25 03:07:30 +01:00
Dave Murphy	1f5f5eedf5	devkitARM: update gcc to 10.2.0	2020-07-25 03:05:58 +01:00
Dave Murphy	5664d84c44	devkitARM: update rules to 1.1.0	2020-07-25 03:02:16 +01:00
Dave Murphy	6e8de1b1d2	devkitARM: next release is 55	2020-07-25 03:02:16 +01:00
Dave Murphy	b16276e9da	devkitARM: separate gdb	2020-07-25 03:02:16 +01:00
Dave Murphy	7f142c7583	devkitARM: use binutils 2.34	2020-07-25 03:02:16 +01:00
Dave Murphy	1a1b35aa3b	devkitARM: disable tm clone registry and cxa-atexit	2020-07-25 03:02:16 +01:00
Dave Murphy	70c8df8709	devkitA64 now release 16	2020-07-25 02:53:33 +01:00
Dave Murphy	bc52f6ac2b	devkitA64: next release is r16	2020-07-24 23:41:39 +01:00
Dave Murphy	81719c49e3	devkitA64: disable cxa_atexit & tm clone registry	2020-07-24 23:41:39 +01:00
Dave Murphy	d4a84c9884	devkitA64: separate rules package	2020-07-24 23:41:39 +01:00
Dave Murphy	25f22b6c93	devkitA64: don't build gdb	2020-07-24 23:41:39 +01:00
Dave Murphy	a0fe0c5297	devkitA64: update to gcc 10.2.0	2020-07-24 23:41:39 +01:00
Dave Murphy	77ad8b785c	add native tools to path when cross building	2020-07-24 23:40:16 +01:00
Dave Murphy	e4b1370595	remove redundant toolsprefix	2020-07-24 23:38:05 +01:00
Dave Murphy	dcfd0e271e	add dummy cross build script for linux PKGBUILD	2020-07-24 23:34:26 +01:00
Dave Murphy	9bf0973c2a	ensure newly built tools on front of path	2020-07-24 16:02:56 +01:00
Dave Murphy	0b31c7ab1c	stop building gdb here	2020-07-24 15:55:13 +01:00
Dave Murphy	90e2936222	add cross build for aarch64 linux	2020-06-30 18:18:19 +01:00
Dave Murphy	556a2a2e02	devkitPPC: refill buffer for large reads	2020-06-08 20:01:52 +01:00
Dave Murphy	6da9ea33f7	devkitPPC: use binutils 2.34	2020-06-08 19:59:53 +01:00
Dave Murphy	433a4bdd80	devkitPPC: releease 37	2020-05-16 03:17:05 +01:00
Dave Murphy	20bf4948a1	devkitPPC: update to gcc 10	2020-05-16 03:15:39 +01:00
Dave Murphy	5e720e01c1	devkitPPC: rework syscalls	2020-05-16 03:14:57 +01:00
Dave Murphy	183ab79cfc	flag for building crtls & rules	2020-05-12 14:04:01 +01:00
Dave Murphy	ad4246dfc4	oops, forgot to update rules script for devkitPPC	2020-05-12 11:37:27 +00:00
Dave Murphy	9165c280f3	restore building of crtls and rules files	2020-05-11 13:43:17 +01:00
Dave Murphy	116613adc8	devkitARM: next release is r54	2020-05-08 10:04:40 +01:00
Dave Murphy	fbc790a8dd	devkitARM: upgrade newlib to 3.3.0	2020-05-08 10:01:17 +01:00
Dave Murphy	91789e0ca8	devkitARM: upgrade gcc to 10.1.0	2020-05-08 10:00:10 +01:00
Dave Murphy	fddf563787	devkitA64: next release is r15	2020-05-08 09:59:14 +01:00
Dave Murphy	45bf89586f	devkitA64: upgrade gdb to 9.1	2020-05-08 09:57:51 +01:00
Dave Murphy	ddaf472951	devkitA64: upgrade newlib to 3.3.0	2020-05-08 09:56:51 +01:00
Dave Murphy	0adc00806f	devkitA64: upgrade gcc to 10.1.0	2020-05-08 09:54:21 +01:00
Dave Murphy	fa1972f5e9	gdb requires CPPFLAGS for cross compile	2020-05-08 09:51:51 +01:00
Dave Murphy	2a306b5e49	strip bins script should be executable	2020-05-08 09:50:02 +01:00
Dave Murphy	1857d52ede	copy dll to libexec folder for windows tools	2020-05-08 09:49:26 +01:00
Dave Murphy	57ec7b67ac	script builds devkitPPC release 36	2020-04-12 02:12:22 +01:00
Dave Murphy	d9392f8f56	stop downloading and building outdated tools archives	2020-04-12 02:10:35 +01:00
Dave Murphy	e0c908dfc2	devkitPPC: next release is r35	2020-04-12 01:38:45 +01:00
Dave Murphy	2ddef0ade4	devkitPPC: update newlib to 3.3.0	2020-04-12 01:38:08 +01:00
Dave Murphy	e68aaf8cdd	devkitPPC: update gcc to 8.4.0	2020-04-12 01:37:13 +01:00