restore building of crtls and rules files

build-devkit.sh

@@ -1,8 +1,9 @@
+
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 52
+#	devkitARM release 54
-#	devkitPPC release 35
+#	devkitPPC release 36
-#	devkitA64 release 13
+#	devkitA64 release 15
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -26,46 +27,12 @@ echo "https://github.com/devkitPro/buildscripts/pulls"
 echo
 
 
-GENERAL_TOOLS_VER=1.0.2
 
-LIBGBA_VER=0.5.2
-GBATOOLS_VER=1.1.0
 DKARM_RULES_VER=1.0.0
 DKARM_CRTLS_VER=1.0.0
 
-LIBNDS_VER=1.7.2
-DEFAULT_ARM7_VER=0.7.4
-DSWIFI_VER=0.4.2
-MAXMOD_VER=1.0.11
-FILESYSTEM_VER=0.9.14
-LIBFAT_VER=1.1.3
-DSTOOLS_VER=1.2.1
-GRIT_VER=0.8.15
-NDSTOOL_VER=2.1.1
-MMUTIL_VER=1.8.7
-
-DFU_UTIL_VER=0.9.1
-STLINK_VER=1.2.3
-
-GAMECUBE_TOOLS_VER=1.0.2
-LIBOGC_VER=1.8.21
-WIILOAD_VER=0.5.1
 DKPPC_RULES_VER=1.0.0
 
-LIBCTRU_VER=1.5.1
-CITRO3D_VER=1.5.0
-CITRO2D_VER=1.1.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
-LIBNX_VER=1.3.0
-
 OSXMIN=${OSXMIN:-10.9}
 
 #---------------------------------------------------------------------------------
@@ -218,37 +185,14 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_
 
 if [ $VERSION -eq 1 ]; then
 
-	targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
-		libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
-		default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
-		libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2  citro3d-src-${CITRO3D_VER}.tar.bz2
-		citro2d-src-${CITRO2D_VER}.tar.bz2"
-
-	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
 
 if [ $VERSION -eq 2 ]; then
 
-	targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
-
-	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"
 fi
 
-if [ $VERSION -eq 3 ]; then
-
-	targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
-
-	hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
-
-fi
 
 
 if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
@@ -258,7 +202,7 @@ else
 fi
 
 cd "$SRCDIR"
-for archive in $archives $targetarchives $hostarchives
+for archive in $archives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
@@ -275,45 +219,23 @@ 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
+if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
-	extract_and_patch binutils $MN_BINUTILS_VER bz2
-fi
-
-for archive in $targetarchives
-do
-	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
-	echo $destdir
-	if [ ! -d $destdir ]; then
-		mkdir -p $destdir
-		bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
-	fi
-done
-
-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
 
 #---------------------------------------------------------------------------------
 # 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;
-fi
 
-if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
+if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ] && [ -f $scriptdir/build-crtls.sh ]; then
-  . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
+  . $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
+	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/bin/
+	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/libexec/gcc/$target/$GCC_VER/
 fi
 
 echo "stripping installed binaries"

config.sh.sample

@@ -35,12 +35,6 @@ BUILD_DKPRO_PACKAGE=0
 #---------------------------------------------------------------------------------
 #BUILD_DKPRO_SKIP_TOOLS=1
 
-#---------------------------------------------------------------------------------
-# Uncomment to skip building of libraries
-#---------------------------------------------------------------------------------
-#BUILD_DKPRO_SKIP_LIBRARIES=1
-
-
 # Automated script execution
 #---------------------------------------------------------------------------------
 #  0: Ask to delete build folders & patched sources

dka64/patches/gcc-10.1.0.patch

@@ -1,10 +1,12 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 7af8e028104..90a3a50f624 100644
+index cf1a87e2efd..bd79664568e 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -945,6 +945,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -1039,7 +1039,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"
@@ -16,7 +18,7 @@ index 7af8e028104..90a3a50f624 100644
          aarch64-*-fuchsia*)
                  tm_file="${tm_file} fuchsia.h"
 diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index c074238df06..ef503ddd5a6 100644
+index da5872cf4d8..ca840ab29cb 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
 @@ -22,6 +22,7 @@
@@ -28,7 +30,7 @@ index c074238df06..ef503ddd5a6 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 7a5c6d7664f..687793841de 100644
+index ee7bed34924..d1e2742d750 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 +47,10 @@ index 7a5c6d7664f..687793841de 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 349ca0c047b..5c03c42c28e 100644
+index 409ca8d9519..fa57bbf8cd5 100644
 --- a/gcc/config/aarch64/aarch64.c
 +++ b/gcc/config/aarch64/aarch64.c
-@@ -12005,8 +12005,24 @@ aarch64_load_tp (rtx target)
+@@ -15951,8 +15951,24 @@ aarch64_load_tp (rtx target)
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -76,10 +78,10 @@ index 349ca0c047b..5c03c42c28e 100644
  }
  
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index 976f9afae54..73263bcb5e7 100644
+index 24767c747ba..0b1bbb5d79e 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -957,6 +957,10 @@ typedef struct
+@@ -1134,6 +1134,10 @@ typedef struct
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -91,10 +93,10 @@ index 976f9afae54..73263bcb5e7 100644
  
  /* When using the tiny addressing model conditional and unconditional branches
 diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index 32a0e1f3685..783c655acf0 100644
+index 8c8be3c2740..1257616a659 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -5693,11 +5693,22 @@
+@@ -6789,11 +6789,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -120,10 +122,10 @@ index 32a0e1f3685..783c655acf0 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 52eaf8c6f40..52bccddc6e3 100644
+index d99d14c137d..08e52537dc6 100644
 --- a/gcc/config/aarch64/aarch64.opt
 +++ b/gcc/config/aarch64/aarch64.opt
-@@ -115,6 +115,20 @@ Enum(aarch64_tls_size) String(32) Value(32)
+@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
  EnumValue
  Enum(aarch64_tls_size) String(48) Value(48)
  
@@ -140,16 +142,26 @@ index 52eaf8c6f40..52bccddc6e3 100644
 +
 +EnumValue
 +Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
++
 +
  march=
- Target RejectNegative ToLower Joined Var(aarch64_arch_string)
+ Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
- -march=ARCH	Use features of architecture ARCH.
+ Use features of architecture ARCH.
+@@ -256,7 +271,7 @@ TargetVariable
+ long aarch64_stack_protector_guard_offset = 0
+ 
+ moutline-atomics
+-Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
++Target Report Var(aarch64_flag_outline_atomics) Save
+ Generate local calls to out-of-line atomic operations.
+ 
+ -param=aarch64-sve-compare-costs=
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 0be1f0d63aa..a54068bfd96 100644
+index 11d20b7be14..02ca761d3bf 100644
 --- a/gcc/config/aarch64/t-aarch64
 +++ b/gcc/config/aarch64/t-aarch64
-@@ -68,5 +68,7 @@ cortex-a57-fma-steering.o: $(srcdir)/config/aarch64/cortex-a57-fma-steering.c \
+@@ -159,8 +159,10 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
- 		$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
+ 		$(srcdir)/config/aarch64/aarch64-bti-insert.c
  
  comma=,
 -MULTILIB_OPTIONS    = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
@@ -158,6 +170,9 @@ index 0be1f0d63aa..a54068bfd96 100644
 +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/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
 index 00000000000..11ba0f5ab1c
@@ -230,11 +245,53 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
+diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+index 250fef59b55..36b2239aa5d 100644
+--- a/gcc/config/i386/host-mingw32.c
++++ b/gcc/config/i386/host-mingw32.c
+@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
+ 
+ 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 a716f708259..6a11011dba7 100644
+index 9f790db0daf..97f52d0b893 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -786,6 +786,11 @@ proper position among the other output files.  */
+@@ -793,6 +793,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -246,7 +303,7 @@ index a716f708259..6a11011dba7 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1081,6 +1086,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;
@@ -254,7 +311,7 @@ index a716f708259..6a11011dba7 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1577,6 +1583,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),
@@ -262,20 +319,8 @@ index a716f708259..6a11011dba7 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 5e894455e16..f2347455de0 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- /* Target machine header files require this define. */
- #define IN_LIBGCC2
-+#define USED_FOR_TARGET
- 
- /* FIXME: Including auto-host is incorrect, but until we have
-    identified the set of defines that need to go into auto-target.h,
 diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 88b0178f9e3..e94fcf9d721 100644
+index f31cf083cbe..649f900aac3 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -288,10 +333,10 @@ index 88b0178f9e3..e94fcf9d721 100644
  #define GTHREAD_USE_WEAK 0
  #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 77e6dc2f6be..3a102997371 100644
+index 80aeb3f8959..308ceedc673 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
-@@ -1293,6 +1293,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1315,6 +1315,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' \
@@ -300,10 +345,10 @@ index 77e6dc2f6be..3a102997371 100644
  	    < $< > $@
  
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index 948a5c1f1c5..ee8e240f6c5 100644
+index eb437ad8d8d..6e076fc63bd 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
-@@ -1719,6 +1719,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1793,6 +1793,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
  	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \

dka64/patches/gdb-8.2.1.patch

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

dka64/scripts/build-gcc.sh

@@ -59,12 +59,12 @@ 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 13" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 15" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
@@ -161,6 +161,7 @@ PLATFORM=`uname -s`
 
 if [ ! -f configured-gdb ]
 then
+	CPPFLAGS="$cppflags" \
 	CFLAGS="$cflags" \
 	CXXFLAGS="$cflags" \
 	LDFLAGS="$ldflags" \

dka64/scripts/build-libs.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export DEVKITPRO=$TOOLPATH
-
-cd $BUILDDIR/libnx-$LIBNX_VER
-$MAKE || { echo "error building libnx"; exit 1; }
-$MAKE install || { echo "error installing libnx"; exit 1; }

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

dkarm-eabi/patches/gcc-10.1.0.patch

@@ -1,8 +1,8 @@
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index ba194a80229..12e023c3728 100644
+index 728be500b80..74c1abad635 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
-@@ -401,7 +401,7 @@ begin arch armv6k
+@@ -392,7 +392,7 @@ begin arch armv6k
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -12,16 +12,10 @@ index ba194a80229..12e023c3728 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 9ec5bf065ac..9ab3ffb109d 100644
+index 3d92bd23322..35cefcde676 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
-@@ -1,4 +1,4 @@
+@@ -16,111 +16,14 @@
--# Copyright (C) 1998-2018 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
- #
- # This file is part of GCC.
- #
-@@ -16,110 +16,83 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
  
@@ -48,14 +42,15 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -v8_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
 -
 -# We don't do anything special with these.  Pre-v4t probably doesn't work.
--all_early_nofp	:= armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t
+-all_early_nofp	:= armv4 armv4t armv5t
 -
--all_early_arch	:= armv5e armv5tej armv6 armv6j armv6k armv6z armv6kz \
+-all_early_arch	:= armv5tej armv6 armv6j armv6k armv6z armv6kz \
 -		   armv6zk armv6t2 iwmmxt iwmmxt2
 -
 -all_v7_a_r	:= armv7-a armv7ve armv7-r
 -
--all_v8_archs	:= armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a
+-all_v8_archs	:= armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
+-		   armv8.5-a armv8.6-a
 -
 -# No floating point variants, require thumb1 softfp
 -all_nofp_t	:= armv6-m armv6s-m armv8-m.base
@@ -114,16 +109,19 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
--
+ 
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
--
++MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
+ 
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
--
+ 
 -# PART 4 - Reuse rules
++MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
++MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
  
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
@@ -134,83 +132,8 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
-+MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
-+
-+
-+MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
-+MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
-+
-+
-+
-+#MULTILIB_OPTIONS     += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
-+#MULTILIB_DIRNAMES    += fa526 fa626 fa606te fa626te fmp626 fa726te
-+#MULTILIB_EXCEPTIONS  += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
-+
-+#MULTILIB_OPTIONS      += march=armv7
-+#MULTILIB_DIRNAMES     += thumb2
-+#MULTILIB_EXCEPTIONS   += march=armv7* marm/*march=armv7*
-+#MULTILIB_MATCHES      += march?armv7=march?armv7-a
-+#MULTILIB_MATCHES      += march?armv7=march?armv7-r
-+#MULTILIB_MATCHES      += march?armv7=march?armv7-m
-+#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-a8
-+#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-r4
-+#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-m3
-+
-+# Not quite true.  We can support hard-vfp calling in Thumb2, but how do we
-+# express that here?  Also, we really need architecture v5e or later
-+# (mcrr etc).
-+#MULTILIB_OPTIONS       += mfloat-abi=hard
-+#MULTILIB_DIRNAMES      += fpu
-+#MULTILIB_EXCEPTIONS    += *mthumb/*mfloat-abi=hard*
-+#MULTILIB_EXCEPTIONS    += *mcpu=fa526/*mfloat-abi=hard*
-+#MULTILIB_EXCEPTIONS    += *mcpu=fa626/*mfloat-abi=hard*
-+
-+# MULTILIB_OPTIONS    += mcpu=ep9312
-+# MULTILIB_DIRNAMES   += ep9312
-+# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
-+#	
-+# MULTILIB_OPTIONS     += mlittle-endian/mbig-endian
-+# MULTILIB_DIRNAMES    += le be
-+# MULTILIB_MATCHES     += mbig-endian=mbe mlittle-endian=mle
-+# 
-+# MULTILIB_OPTIONS    += mfloat-abi=hard/mfloat-abi=soft
-+# MULTILIB_DIRNAMES   += fpu soft
-+# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
-+# 
-+# MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
-+# MULTILIB_DIRNAMES   += normal interwork
-+# 
-+# MULTILIB_OPTIONS    += fno-leading-underscore/fleading-underscore
-+# MULTILIB_DIRNAMES   += elf under
-+# 
-+# MULTILIB_OPTIONS    += mcpu=arm7
-+# MULTILIB_DIRNAMES   += nofmult
-+# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7*
-+# # Note: the multilib_exceptions matches both -mthumb and
-+# # -mthumb-interwork
-+# #
-+# # We have to match all the arm cpu variants which do not have the
-+# # multiply instruction and treat them as if the user had specified
-+# # -mcpu=arm7.  Note that in the following the ? is interpreted as
-+# # an = for the purposes of matching command line options.
-+# # FIXME: There ought to be a better way to do this.
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7d
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7di
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm70
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm700
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm700i
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm710
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm710c
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7100
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7500
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7500fe
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm6
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm60
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm600
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm610
-+# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm620
 diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index 12dd0931b08..59584fe64bc 100644
+index 9ad2947505f..1790caa8e88 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
 @@ -29,7 +29,7 @@
@@ -222,22 +145,60 @@ index 12dd0931b08..59584fe64bc 100644
  
  #undef  STARTFILE_SPEC
  #define STARTFILE_SPEC	\
-@@ -93,4 +93,9 @@
+@@ -93,4 +93,5 @@
     udivmoddi4, which will depend on the exception unwind routines,
     which will depend on abort, which is defined in libc.  */ 
  #undef LINK_GCC_C_SEQUENCE_SPEC
--#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
+-#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"
 +
-+/* The system headers under devkitARM are C++-aware.  */
+diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-+#undef NO_IMPLICIT_EXTERN_C
+index 250fef59b55..36b2239aa5d 100644
-+#define NO_IMPLICIT_EXTERN_C
+--- 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 a716f708259..6a11011dba7 100644
+index 9f790db0daf..97f52d0b893 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -786,6 +786,11 @@ proper position among the other output files.  */
+@@ -793,6 +793,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -249,7 +210,7 @@ index a716f708259..6a11011dba7 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1081,6 +1086,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;
@@ -257,7 +218,7 @@ index a716f708259..6a11011dba7 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1577,6 +1583,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),
@@ -275,16 +236,3 @@ index dddddc7c444..c2502597953 100644
  # the option is safe.
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 5e894455e16..f81c9c6a64c 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- /* 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.  */

dkarm-eabi/patches/gdb-8.2.1.patch

@@ -1,7 +1,29 @@
-diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
---- gdb-8.2.1/gdb/arm-3ds-tdep.c	1970-01-01 01:00:00.000000000 +0100
+index 9799a7a65d..ccd3f8a626 100644
-+++ gdb-8.2.1-apple/gdb/arm-3ds-tdep.c	2019-02-19 17:15:22.100604954 +0000
+--- a/gdb/Makefile.in
-@@ -0,0 +1,157 @@
++++ 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: */
@@ -49,6 +71,32 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  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)
 +{
@@ -124,6 +172,108 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  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)
@@ -146,7 +296,13 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  tdep->fp_model = ARM_FLOAT_VFP;
 +
 +  /* Single stepping.  */
-+  set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
++  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");
@@ -159,10 +315,11 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
 +                          arm_3ds_init_abi);
 +}
-diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
+diff --git a/gdb/configure.tgt b/gdb/configure.tgt
---- gdb-8.2.1/gdb/configure.tgt	2018-12-23 05:51:54.000000000 +0000
+index f197160896..e2835ddef5 100644
-+++ gdb-8.2.1-apple/gdb/configure.tgt	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/configure.tgt
-@@ -61,7 +61,7 @@
++++ b/gdb/configure.tgt
+@@ -61,7 +61,7 @@ arc*-*-*)
  	;;
  
  arm*-*-*)
@@ -171,10 +328,11 @@ diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
  
  hppa*-*-*)
  	# Target: HP PA-RISC
-diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-directory/Makefile.in
+diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
---- gdb-8.2.1/gdb/data-directory/Makefile.in	2018-01-05 04:07:23.000000000 +0000
+index 753e0b69a3..645eb043b9 100644
-+++ gdb-8.2.1-apple/gdb/data-directory/Makefile.in	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/data-directory/Makefile.in
-@@ -63,7 +63,7 @@
++++ b/gdb/data-directory/Makefile.in
+@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
  	sparc-linux.xml \
  	sparc64-linux.xml
  
@@ -183,10 +341,11 @@ diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-di
  
  PYTHON_DIR = python
  PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
-diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
+diff --git a/gdb/defs.h b/gdb/defs.h
---- gdb-8.2.1/gdb/defs.h	2018-12-23 05:51:54.000000000 +0000
+index fc4217005a..a179a6d820 100644
-+++ gdb-8.2.1-apple/gdb/defs.h	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/defs.h
-@@ -495,6 +495,7 @@
++++ b/gdb/defs.h
+@@ -495,6 +495,7 @@ enum gdb_osabi
    GDB_OSABI_LYNXOS178,
    GDB_OSABI_NEWLIB,
    GDB_OSABI_SDE,
@@ -194,10 +353,11 @@ diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
  
    GDB_OSABI_INVALID		/* keep this last */
  };
-diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
+diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
---- gdb-8.2.1/gdb/dtrace-probe.c	2018-12-23 05:51:54.000000000 +0000
+index fa4e06e794..b6afc4cc7c 100644
-+++ gdb-8.2.1-apple/gdb/dtrace-probe.c	2019-02-19 17:30:16.449175937 +0000
+--- a/gdb/dtrace-probe.c
-@@ -100,7 +100,7 @@
++++ b/gdb/dtrace-probe.c
+@@ -100,7 +100,7 @@ public:
  
  /* DTrace static_probe_ops.  */
  
@@ -206,29 +366,11 @@ diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
  
  /* The following structure represents a dtrace probe.  */
  
-diff -NBaur gdb-8.2.1/gdb/Makefile.in gdb-8.2.1-apple/gdb/Makefile.in
+diff --git a/gdb/osabi.c b/gdb/osabi.c
---- gdb-8.2.1/gdb/Makefile.in	2018-12-23 05:51:54.000000000 +0000
+index 7d0540b181..49d3f78331 100644
-+++ gdb-8.2.1-apple/gdb/Makefile.in	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/osabi.c
-@@ -684,6 +684,7 @@
++++ b/gdb/osabi.c
- 	arch/arm-linux.o \
+@@ -80,6 +80,7 @@ static const struct osabi_names gdb_osabi_names[] =
- 	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 @@
- 	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 -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
---- gdb-8.2.1/gdb/osabi.c	2018-12-23 05:51:54.000000000 +0000
-+++ gdb-8.2.1-apple/gdb/osabi.c	2019-02-19 17:15:22.104618045 +0000
-@@ -80,6 +80,7 @@
    { "LynxOS178", NULL },
    { "Newlib", NULL },
    { "SDE", NULL },
@@ -236,10 +378,11 @@ diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
  
    { "<invalid>", NULL }
  };
-diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
+diff --git a/gdb/probe.c b/gdb/probe.c
---- gdb-8.2.1/gdb/probe.c	2018-12-23 05:51:54.000000000 +0000
+index 1f3da213ef..4acbeb8704 100644
-+++ gdb-8.2.1-apple/gdb/probe.c	2019-02-19 17:31:05.266578008 +0000
+--- a/gdb/probe.c
-@@ -60,7 +60,7 @@
++++ b/gdb/probe.c
+@@ -60,7 +60,7 @@ public:
  
  /* Static operations associated with a generic probe.  */
  
@@ -248,10 +391,11 @@ diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
  
  /* 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
+diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
---- gdb-8.2.1/gdb/record-btrace.c	2018-12-23 05:51:54.000000000 +0000
+index 09a3f6cc5c..9f90a6b436 100644
-+++ gdb-8.2.1-apple/gdb/record-btrace.c	2019-02-19 17:31:33.301731324 +0000
+--- a/gdb/record-btrace.c
-@@ -144,7 +144,7 @@
++++ 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.  */
@@ -260,10 +404,11 @@ diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
  
  /* 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
+diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
---- gdb-8.2.1/gdb/stap-probe.c	2018-12-23 05:51:54.000000000 +0000
+index ed7e1a0d3f..42fad3835f 100644
-+++ gdb-8.2.1-apple/gdb/stap-probe.c	2019-02-19 17:29:35.744567941 +0000
+--- a/gdb/stap-probe.c
-@@ -119,7 +119,7 @@
++++ b/gdb/stap-probe.c
+@@ -119,7 +119,7 @@ public:
  
  /* SystemTap static_probe_ops.  */
  
@@ -272,9 +417,11 @@ diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
  
  class stap_probe : public probe
  {
-diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml
+diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
---- gdb-8.2.1/gdb/syscalls/arm-3ds.xml	1970-01-01 01:00:00.000000000 +0100
+new file mode 100644
-+++ gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml	2019-02-19 17:15:22.104618045 +0000
+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">
@@ -435,10 +582,11 @@ diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-
 +  <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
 +
 +</syscalls_info>
-diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
+diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
---- gdb-8.2.1/gdb/tui/tui-hooks.c	2018-12-23 05:51:54.000000000 +0000
+index efa02e2f08..1c341dcf47 100644
-+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c	2019-02-19 17:28:53.178460364 +0000
+--- a/gdb/tui/tui-hooks.c
-@@ -205,7 +205,7 @@
++++ 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.  */

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
@@ -33,7 +33,7 @@ index 41843eed1..dc0e2a5fd 100644
  AS=${AS-as}
 diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
 new file mode 100644
-index 000000000..0d2be31c6
+index 000000000..7ee40deec
 --- /dev/null
 +++ b/libgloss/libsysbase/Makefile.in
 @@ -0,0 +1,148 @@
@@ -104,7 +104,7 @@ index 000000000..0d2be31c6
 +	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
 +
 +# object files needed
-+OBJS = abort.o iosupport.o clocks.o close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
++OBJS = abort.o iosupport.o clocks.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
 +	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 \
@@ -927,58 +927,6 @@ index 000000000..01cfee469
 +   }
 +}
 +
-diff --git a/libgloss/libsysbase/close.c b/libgloss/libsysbase/close.c
-new file mode 100644
-index 000000000..931ad07b1
---- /dev/null
-+++ b/libgloss/libsysbase/close.c
-@@ -0,0 +1,46 @@
-+#include "config.h"
-+#include <_ansi.h>
-+#include <_syslist.h>
-+#include <stdio.h>
-+#include <errno.h>
-+
-+#include <sys/iosupport.h>
-+
-+#ifdef REENTRANT_SYSCALLS_PROVIDED
-+//---------------------------------------------------------------------------------
-+int _close_r(struct _reent *ptr, int fileDesc) {
-+//---------------------------------------------------------------------------------
-+#else
-+//---------------------------------------------------------------------------------
-+int _close(int fileDesc) {
-+//---------------------------------------------------------------------------------
-+	struct _reent *ptr = _REENT;
-+#endif
-+	int ret = -1;
-+	unsigned int dev = 0;
-+
-+	if(fileDesc!=-1) {
-+
-+		__handle *handle = __get_handle(fileDesc);
-+
-+		if ( handle != NULL) {
-+			dev = handle->device;
-+			handle->refcount--;
-+			if (handle->refcount == 0 ) {
-+
-+				if(devoptab_list[dev]->close_r) {
-+					ptr->deviceData = devoptab_list[dev]->deviceData;
-+					ret = devoptab_list[dev]->close_r(ptr,handle->fileStruct);
-+				}
-+				else
-+					ret = 0;
-+
-+				__release_handle(fileDesc);
-+			} else {
-+				ret = 0;
-+			}
-+
-+		}
-+	}
-+	return ret;
-+}
 diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
 new file mode 100644
 index 000000000..48ce950b4
@@ -1012,7 +960,7 @@ index 000000000..48ce950b4
 +#undef __SYMBOL_PREFIX
 diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
 new file mode 100644
-index 000000000..c4b5a79b6
+index 000000000..7fe331552
 --- /dev/null
 +++ b/libgloss/libsysbase/configure
 @@ -0,0 +1,4158 @@
@@ -1599,7 +1547,7 @@ index 000000000..c4b5a79b6
 +PACKAGE_BUGREPORT=
 +PACKAGE_URL=
 +
-+ac_unique_file="close.c"
++ac_unique_file="abort.c"
 +ac_subst_vars='LTLIBOBJS
 +LIBOBJS
 +host_makefile_frag_path
@@ -5176,7 +5124,7 @@ index 000000000..c4b5a79b6
 +
 diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
 new file mode 100644
-index 000000000..bf276a413
+index 000000000..3da91ed98
 --- /dev/null
 +++ b/libgloss/libsysbase/configure.in
 @@ -0,0 +1,199 @@
@@ -5195,7 +5143,7 @@ index 000000000..bf276a413
 +# Process this file with autoconf to produce a configure script.
 +#
 +AC_PREREQ(2.59)
-+AC_INIT(close.c)
++AC_INIT(abort.c)
 +AC_CONFIG_HEADER(config.h)
 +
 +if test "${enable_shared}" = "yes" ; then
@@ -6001,10 +5949,13 @@ index 000000000..9d5b74724
 +
 diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
 new file mode 100644
-index 000000000..f3fcc88f7
+index 000000000..6bf9ab89e
 --- /dev/null
 +++ b/libgloss/libsysbase/handle_manager.c
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,229 @@
++#include "config.h"
++#include <_ansi.h>
++#include <_syslist.h>
 +#include <stdlib.h>
 +#include <stdio.h>
 +#include <errno.h>
@@ -6025,7 +5976,7 @@ index 000000000..f3fcc88f7
 +
 +__LOCK_INIT(static, __hndl_lock);
 +
-+void __free_handle(__handle *handle) {
++static void __free_handle(__handle *handle) {
 +
 +	if ( NULL != handle
 +	&& handle != &__stdin_handle
@@ -6093,8 +6044,11 @@ index 000000000..f3fcc88f7
 +
 +	if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
 +
-+	return handles[fd];
++	__lock_acquire (__hndl_lock);
++	__handle *handle = handles[fd];
++	__lock_release (__hndl_lock);
 +
++	return handle;
 +}
 +
 +int dup(int oldfd) {
@@ -6126,57 +6080,107 @@ index 000000000..f3fcc88f7
 +
 +int dup2(int oldfd, int newfd) {
 +
-+
-+	__lock_acquire (__hndl_lock);
-+
 +	if ( newfd < 0 || newfd >= MAX_HANDLES ||
++		 oldfd < 0 || oldfd >= MAX_HANDLES) {
 +
-+		 oldfd < 0 || oldfd >= MAX_HANDLES ||
-+		 handles[oldfd] == NULL ) {
-+
-+		__lock_release (__hndl_lock);
 +		errno = EBADF;
 +
 +		return -1;
 +	}
 +
 +	if ( newfd == oldfd ) {
-+		__lock_release (__hndl_lock);
 +		return newfd;
 +	}
 +
++	__lock_acquire (__hndl_lock);
++
++	if ( handles[oldfd] == NULL ) {
++		__lock_release (__hndl_lock);
++		errno = EBADF;
++
++		return -1;
++	}
 +
 +	__handle *handle = handles[newfd];
 +
-+	if ( NULL != handle ) {
-+
-+		handle->refcount--;
-+
-+	}
-+
 +	handles[newfd] = handles[oldfd];
 +	handles[newfd]->refcount++;
 +
-+	__lock_release (__hndl_lock);
++	if ( handle ) {
 +
-+	if ( NULL != handle ) {
++		int ref = --handle->refcount;
++		__lock_release (__hndl_lock);
 +
-+		if (handle->refcount == 0 ) {
++		if ( ref == 0 ) {
 +
-+			if( devoptab_list[handle->device]->close_r != NULL) {
++			if ( devoptab_list[handle->device]->close_r ) {
 +
++				_REENT->deviceData = devoptab_list[handle->device]->deviceData;
 +				devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
 +
-+			} else {
-+
-+				__free_handle(handle);
-+
 +			}
++
++			__free_handle(handle);
 +		}
++
++	} else {
++
++		__lock_release (__hndl_lock);
++
 +	}
 +
 +	return newfd;
++}
 +
++#ifdef REENTRANT_SYSCALLS_PROVIDED
++//---------------------------------------------------------------------------------
++int _close_r(struct _reent *ptr, int fd) {
++//---------------------------------------------------------------------------------
++#else
++//---------------------------------------------------------------------------------
++int _close(int fd) {
++//---------------------------------------------------------------------------------
++	struct _reent *ptr = _REENT;
++#endif
++	int ret = 0;
++
++	if (fd < 0 || fd >= MAX_HANDLES) {
++
++		ptr->_errno = EBADF;
++		return -1;
++
++	}
++
++	__lock_acquire (__hndl_lock);
++
++	__handle *handle = handles[fd];
++
++	if ( !handle ) {
++
++		__lock_release (__hndl_lock);
++		ptr->_errno = EBADF;
++		return -1;
++
++	}
++
++	int ref = --handle->refcount;
++	handles[fd] = NULL;
++
++	__lock_release (__hndl_lock);
++
++	if ( ref == 0 ) {
++
++		if ( devoptab_list[handle->device]->close_r ) {
++
++			ptr->deviceData = devoptab_list[handle->device]->deviceData;
++			ret = devoptab_list[handle->device]->close_r(ptr,handle->fileStruct);
++
++		}
++
++		__free_handle(handle);
++	}
++
++	return ret;
 +}
 diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
 new file mode 100644
@@ -7404,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"
  	;;
@@ -7436,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 @@
@@ -7516,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" {
@@ -7647,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 */
@@ -7660,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
@@ -7669,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 );
  
@@ -8013,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,
@@ -8025,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;
@@ -8033,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;
@@ -8047,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;
@@ -8118,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
@@ -8272,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))
- 

dkarm-eabi/scripts/build-crtls.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+export DEVKITARM=$DEVKITPRO/devkitARM
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+mkdir -p rules
+cd rules
+tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
+make install
+
+#---------------------------------------------------------------------------------
+# Install and build the crt0 files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+mkdir -p crtls
+cd crtls
+tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
+make install
+

dkarm-eabi/scripts/build-gcc.sh

@@ -64,7 +64,7 @@ then
 		--prefix=$prefix \
 		--enable-lto\
 		--with-system-zlib \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 52" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 54" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }

dkarm-eabi/scripts/build-libs.sh

@@ -1,71 +0,0 @@
-#!/bin/sh
-
-#---------------------------------------------------------------------------------
-# set env variables
-#---------------------------------------------------------------------------------
-export DEVKITPRO=$TOOLPATH
-export DEVKITARM=$DEVKITPRO/devkitARM
-
-#---------------------------------------------------------------------------------
-# Install the rules files
-#---------------------------------------------------------------------------------
-cd $BUILDDIR
-
-mkdir -p rules
-cd rules
-tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
-make install
-
-#---------------------------------------------------------------------------------
-# Install and build the crt0 files
-#---------------------------------------------------------------------------------
-cd $BUILDDIR
-
-mkdir -p crtls
-cd crtls
-tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
-make install
-
-cd $BUILDDIR/libgba-$LIBGBA_VER
-$MAKE || { echo "error building libgba"; exit 1; }
-$MAKE install || { echo "error installing libgba"; exit 1; }
-
-cd $BUILDDIR/libnds-$LIBNDS_VER
-$MAKE || { echo "error building libnds"; exit 1; }
-$MAKE install || { echo "error installing libnds"; exit 1; }
-
-cd $BUILDDIR/dswifi-$DSWIFI_VER
-$MAKE || { echo "error building dswifi"; exit 1; }
-$MAKE install || { echo "error installing dswifi"; exit 1; }
-
-cd $BUILDDIR/maxmod-$MAXMOD_VER
-$MAKE || { echo "error building maxmod"; exit 1; }
-$MAKE install || { echo "error installing maxmod"; exit 1; }
-
-cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
-$MAKE || { echo "error building default arm7"; exit 1; }
-$MAKE install || { echo "error installing default arm7"; exit 1; }
-
-cd $BUILDDIR/libfat-$LIBFAT_VER
-$MAKE nds-install || { echo "error building nds libfat"; exit 1; }
-$MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
-
-#cd $BUILDDIR/libmirko-$LIBMIRKO_VER
-#$MAKE || { echo "error building libmirko"; exit 1; }
-#$MAKE install || { echo "error installing libmirko"; exit 1; }
-
-cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
-$MAKE || { echo "error building libfilesystem"; exit 1; }
-$MAKE install || { echo "error installing libfilesystem"; exit 1; }
-
-cd $BUILDDIR/libctru-$LIBCTRU_VER
-$MAKE || { echo "error building libctru"; exit 1; }
-$MAKE install || { echo "error installing libctru"; exit 1; }
-
-cd $BUILDDIR/citro3d-$CITRO3D_VER
-$MAKE || { echo "error building citro3d"; exit 1; }
-$MAKE install || { echo "error installing citro3d"; exit 1; }
-
-cd $BUILDDIR/citro2d-$CITRO2D_VER
-$MAKE || { echo "error building citro2d"; exit 1; }
-$MAKE install || { echo "error installing citro2d"; exit 1; }

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

dkppc/patches/gcc-8.4.0.patch

@@ -1,5 +1,5 @@
 diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f..814104f 100644
+index 7b29f1f3327..814104f32a2 100644
 --- a/config/gthr.m4
 +++ b/config/gthr.m4
 @@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
@@ -11,10 +11,10 @@ index 7b29f1f..814104f 100644
      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
+index 47cfce25dee..cfd8ce71123 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2464,7 +2464,7 @@ powerpc-xilinx-eabi*)
+@@ -2480,7 +2480,7 @@ powerpc-xilinx-eabi*)
  	use_gcc_stdint=wrap
  	;;
  powerpc-*-eabi*)
@@ -24,7 +24,7 @@ index 7af8e02..dc58cab 100644
  	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
  	use_gcc_stdint=wrap
 diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index f46e797..fd39e64 100644
+index f46e797d610..fd39e64c38d 100644
 --- a/gcc/config/newlib-stdint.h
 +++ b/gcc/config/newlib-stdint.h
 @@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -37,7 +37,7 @@ 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 b83b304e3eb..b85359edcfc 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
 @@ -212,6 +212,7 @@
@@ -58,10 +58,10 @@ 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
+index 4dbe8e5d133..3e2095e5b64 100644
 --- a/gcc/config/rs6000/rs6000.md
 +++ b/gcc/config/rs6000/rs6000.md
-@@ -5625,19 +5625,19 @@
+@@ -5631,19 +5631,19 @@
      tmp = gen_reg_rtx (DImode);
  
    emit_insn (gen_fctiwz_<mode> (tmp, src));
@@ -89,7 +89,7 @@ index 4d69c1d..af2d7b5 100644
        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 bb19d0dcd41..74d1e474432 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
@@ -247,7 +247,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 34fea0ddd08..084a8ae435e 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
 @@ -124,6 +124,26 @@ mads
@@ -278,10 +278,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 97ba7d7d69c..c0e468546ed 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -11692,7 +11692,7 @@ case ${enable_threads} in
+@@ -11693,7 +11693,7 @@ case ${enable_threads} in
      # default
      target_thread_file='single'
      ;;
@@ -291,7 +291,7 @@ index 6121e16..6584112 100755
      target_thread_file=${enable_threads}
      ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc6..c42b3ef 100644
+index d6f2d5b2ed0..15edac2ce9b 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -1611,7 +1611,7 @@ case ${enable_threads} in
@@ -304,7 +304,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 ba2b2623301..8d866107142 100644
 --- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
 @@ -24,7 +24,7 @@
@@ -322,7 +322,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 077e33f34d5..b7be68b710f 100644
 --- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
 @@ -24,7 +24,7 @@
@@ -341,7 +341,7 @@ 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..94d6ba94ec0
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.c
 @@ -0,0 +1,349 @@
@@ -696,7 +696,7 @@ index 0000000..94d6ba9
 +}
 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..281c19d2a60
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.h
 @@ -0,0 +1,185 @@
@@ -886,7 +886,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,7 +896,7 @@ 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 b2f3f870844..c6f93f8b3ac 100644
 --- a/libgcc/configure
 +++ b/libgcc/configure
 @@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
@@ -908,7 +908,7 @@ index b2f3f87..c6f93f8 100644
      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 5e894455e16..f2347455de0 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
 @@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -920,10 +920,10 @@ index 5e89445..f234745 100644
  /* FIXME: Including auto-host is incorrect, but until we have
     identified the set of defines that need to go into auto-target.h,
 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 5535bfa..9f86d5d 100755
+index 61457e940ec..a7c63407ced 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -15180,6 +15180,7 @@ $as_echo "$target_thread_file" >&6; }
+@@ -15382,6 +15382,7 @@ $as_echo "$target_thread_file" >&6; }
  
  case $target_thread_file in
      aix)	thread_header=config/rs6000/gthr-aix.h ;;

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
  
@@ -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
@@ -7389,10 +7390,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 +7471,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" {
@@ -7598,10 +7599,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 +7611,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 +7620,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 );
  

dkppc/scripts/build-crtls.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+export DEVKITARM=$DEVKITPRO/devkitARM
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+mkdir -p rules
+cd rules
+tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
+make install

dkppc/scripts/build-gcc.sh

@@ -97,7 +97,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 36" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \

dkppc/scripts/build-libs.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-export DEVKITPPC=$TOOLPATH/devkitPPC
-export DEVKITPRO=$TOOLPATH
-
-cd $BUILDDIR
-mkdir -p rules
-cd rules
-tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
-make install
-
-cd $BUILDDIR/libogc-$LIBOGC_VER
-
-if [ ! -f installed ]; then
-	echo "Building & installing libogc"
-	$MAKE install || { echo "libogc install failed"; exit 1; }
-	touch installed
-fi
-
-cd $BUILDDIR/libfat-$LIBFAT_VER
-
-if [ ! -f installed ]; then
-	echo "Building & installing libfat"
-	$MAKE ogc-install || { echo "libfat install failed"; exit 1; }
-	touch installed
-fi
-

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

select_toolchain.sh

@@ -30,9 +30,9 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=8.3.0
+    GCC_VER=10.1.0
     BINUTILS_VER=2.32
-    NEWLIB_VER=3.1.0
+    NEWLIB_VER=3.3.0
     GDB_VER=8.2.1
     basedir='dkarm-eabi'
     package=devkitARM
@@ -40,10 +40,10 @@ case "$VERSION" in
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=8.3.0
+    GCC_VER=8.4.0
     BINUTILS_VER=2.32
     MN_BINUTILS_VER=2.17
-    NEWLIB_VER=3.1.0
+    NEWLIB_VER=3.3.0
     GDB_VER=8.2.1
     basedir='dkppc'
     package=devkitPPC
@@ -51,10 +51,10 @@ case "$VERSION" in
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=8.3.0
+    GCC_VER=10.1.0
     BINUTILS_VER=2.32
-    NEWLIB_VER=3.1.0
+    NEWLIB_VER=3.3.0
-    GDB_VER=8.2.1
+    GDB_VER=9.1
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf