script builds devkitPPC release 36

build-devkit.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
 #	devkitARM release 53-1
-#	devkitPPC release 35
-#	devkitA64 release 13
+#	devkitPPC release 36
+#	devkitA64 release 14
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -26,34 +26,12 @@ 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
 
-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
-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
-
 OSXMIN=${OSXMIN:-10.9}
 
 #---------------------------------------------------------------------------------
@@ -206,27 +184,14 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_
 
 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
 
 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"
 fi
 
-if [ $VERSION -eq 3 ]; then
-
-	hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
-
-fi
 
 
 if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
@@ -236,7 +201,7 @@ else
 fi
 
 cd "$SRCDIR"
-for archive in $archives $hostarchives
+for archive in $archives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
@@ -257,23 +222,11 @@ 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
-
 #---------------------------------------------------------------------------------
 # 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
-
 cd $BUILDSCRIPTDIR
 
 if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then

dka64/patches/gcc-9.2.0.patch

@@ -1,8 +1,8 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 7af8e028104..90a3a50f624 100644
+index ddd3b8f4d9d..014df2e5a59 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -945,6 +945,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -985,6 +985,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
  	case $target in
  	aarch64-*-elf*)
  		use_gcc_stdint=wrap
@@ -16,7 +16,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 bbebd0ef029..8f38510402f 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
 @@ -22,6 +22,7 @@
@@ -28,7 +28,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 4b07d296a11..037985f1d86 100644
 --- a/gcc/config/aarch64/aarch64-opts.h
 +++ b/gcc/config/aarch64/aarch64-opts.h
 @@ -48,6 +48,12 @@ enum aarch64_tls_type {
@@ -45,10 +45,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 6b25d9cbfae..39c7026a90c 100644
 --- a/gcc/config/aarch64/aarch64.c
 +++ b/gcc/config/aarch64/aarch64.c
-@@ -12005,8 +12005,24 @@ aarch64_load_tp (rtx target)
+@@ -13186,8 +13186,24 @@ aarch64_load_tp (rtx target)
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -76,10 +76,10 @@ index 349ca0c047b..5c03c42c28e 100644
  }
  
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index 976f9afae54..73263bcb5e7 100644
+index fc6df970c2e..705c6de868f 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -957,6 +957,10 @@ typedef struct
+@@ -1006,6 +1006,10 @@ typedef struct
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -91,10 +91,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 5a1894063a1..7c9d9452659 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -5693,11 +5693,22 @@
+@@ -6583,11 +6583,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -120,10 +120,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 7719c3b6352..cd32a639b16 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,20 +140,23 @@ index 52eaf8c6f40..52bccddc6e3 100644
 +
 +EnumValue
 +Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
++
 +
  march=
  Target RejectNegative ToLower Joined Var(aarch64_arch_string)
- -march=ARCH	Use features of architecture ARCH.
+ Use features of architecture ARCH.
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 0be1f0d63aa..a54068bfd96 100644
+index ee471f8983f..aedaefdd62d 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 \
- 		$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
+@@ -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
  
- 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
@@ -231,10 +234,10 @@ index 00000000000..9acbbf9d27c
 +
 +; This comment is to ensure we retain the blank line above.
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a716f708259..6a11011dba7 100644
+index 4f57765b012..2899202cc05 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -786,6 +786,11 @@ proper position among the other output files.  */
+@@ -794,6 +794,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -246,7 +249,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;
+@@ -1086,6 +1091,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 +257,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[] =
+@@ -1583,6 +1589,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),
@@ -263,7 +266,7 @@ index a716f708259..6a11011dba7 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 5e894455e16..f2347455de0 100644
+index 4927a9f8977..8311b6a7f5e 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
 @@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -275,7 +278,7 @@ index 5e894455e16..f2347455de0 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/libgcc/gthr.h b/libgcc/gthr.h
-index 88b0178f9e3..e94fcf9d721 100644
+index 67826419882..d9f01c6c371 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -288,10 +291,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 1deacb80ca2..0de11c15a3a 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}
+@@ -1338,6 +1338,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 +303,10 @@ index 77e6dc2f6be..3a102997371 100644
  	    < $< > $@
  
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index 948a5c1f1c5..ee8e240f6c5 100644
+index bc475c6dd90..bfa3e71898a 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}
+@@ -1817,6 +1817,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/newlib-3.1.0.patch

@@ -6555,10 +6555,10 @@ index 000000000..13bd0fba1
 +}
 diff --git a/libgloss/libsysbase/link.c b/libgloss/libsysbase/link.c
 new file mode 100644
-index 000000000..1675e5c24
+index 000000000..162f70f63
 --- /dev/null
 +++ b/libgloss/libsysbase/link.c
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,36 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -6572,11 +6572,14 @@ index 000000000..1675e5c24
 +int _link(const char *existing, const char *new) {
 +	struct _reent *r = _REENT;
 +#endif
-+	int ret;
++	int ret = -1;
 +	int sourceDev = FindDevice(existing);
 +	int destDev = FindDevice(new);
 +
-+	ret = -1;
++	if (sourceDev == -1 || destDev == -1 ) {
++		r->_errno = ENODEV;
++		return ret;
++	}
 +
 +	if ( sourceDev == destDev) {
 +		if (devoptab_list[destDev]->link_r) {
@@ -6854,26 +6857,30 @@ index 000000000..456590956
 +char *fake_heap_start = (char*)0;
 diff --git a/libgloss/libsysbase/mkdir.c b/libgloss/libsysbase/mkdir.c
 new file mode 100644
-index 000000000..b4fcbd3d7
+index 000000000..19742b774
 --- /dev/null
 +++ b/libgloss/libsysbase/mkdir.c
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,23 @@
 +#include <reent.h>
 +#include <sys/iosupport.h>
 +#include <errno.h>
 +
 +int mkdir (const char *path, mode_t mode) {
 +	struct _reent *r = _REENT;
-+	int ret;
-+	int dev = FindDevice(path);
-+	ret = -1;
++	int ret = -1;
 +
-+	if (devoptab_list[dev]->mkdir_r) {
-+		r->deviceData = devoptab_list[dev]->deviceData;
-+		ret = devoptab_list[dev]->mkdir_r(r, path, mode);
-+	} else {
-+		r->_errno = ENOSYS;
-+	}
++        int dev = FindDevice(path);
++
++        if(dev!=-1) {
++                if(devoptab_list[dev]->mkdir_r) {
++                        r->deviceData = devoptab_list[dev]->deviceData;
++                        ret = devoptab_list[dev]->mkdir_r(r,path,mode);
++                } else {
++                        r->_errno = ENOSYS;
++                }
++        } else {
++                r->_errno =     ENODEV;
++        }
 +
 +	return ret;
 +}
@@ -8092,10 +8099,10 @@ index 000000000..838a8c796
 +
 diff --git a/libgloss/libsysbase/rename.c b/libgloss/libsysbase/rename.c
 new file mode 100644
-index 000000000..97a056a72
+index 000000000..b54e0ce7c
 --- /dev/null
 +++ b/libgloss/libsysbase/rename.c
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,37 @@
 +#include "config.h"
 +#include <reent.h>
 +#include <sys/iosupport.h>
@@ -8111,11 +8118,14 @@ index 000000000..97a056a72
 +#endif
 +	struct _reent *r = _REENT;
 +
-+	int ret;
++	int ret = -1;
 +	int sourceDev = FindDevice(existing);
 +	int destDev = FindDevice(newName);
 +
-+	ret = -1;
++        if (sourceDev == -1 || destDev == -1 ) {
++                r->_errno = ENODEV;
++                return ret;
++        }
 +
 +	if ( sourceDev == destDev) {
 +		if (devoptab_list[destDev]->rename_r) {
@@ -8229,10 +8239,10 @@ index 000000000..5dd550c5c
 +}
 diff --git a/libgloss/libsysbase/scandir.c b/libgloss/libsysbase/scandir.c
 new file mode 100644
-index 000000000..1333df4b2
+index 000000000..5c673af52
 --- /dev/null
 +++ b/libgloss/libsysbase/scandir.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,76 @@
 +#include <sys/types.h>
 +#include <sys/stat.h>
 +#include <stddef.h>
@@ -8262,6 +8272,8 @@ index 000000000..1333df4b2
 +	int (*filter) __P((const struct dirent *)),
 +	int (*compar) __P((const struct dirent **, const struct dirent **)))
 +{
++	errno = 0;
++
 +	DIR *d = opendir(dirname);
 +
 +	if (!d) return -1;
@@ -9330,10 +9342,10 @@ index 000000000..82d2e3576
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/lock.h b/newlib/libc/include/sys/lock.h
-index 528904957..30cb099e6 100644
+index 528904957..e49f77b75 100644
 --- a/newlib/libc/include/sys/lock.h
 +++ b/newlib/libc/include/sys/lock.h
-@@ -1,69 +1,97 @@
+@@ -1,69 +1,105 @@
  #ifndef __SYS_LOCK_H__
  #define __SYS_LOCK_H__
  
@@ -9342,19 +9354,68 @@ index 528904957..30cb099e6 100644
 -#include <newlib.h>
  #include <_ansi.h>
 +#include <stdint.h>
-+
+ 
+-#if !defined(_RETARGETABLE_LOCKING)
 +typedef int32_t _LOCK_T;
-+
+ 
+-typedef int _LOCK_T;
+-typedef int _LOCK_RECURSIVE_T;
 +struct __lock_t {
 +	_LOCK_T lock;
 +	uint32_t thread_tag;
 +	uint32_t counter;
 +};
-+
+ 
+-#define __LOCK_INIT(class,lock) static int lock = 0;
+-#define __LOCK_INIT_RECURSIVE(class,lock) static int lock = 0;
+-#define __lock_init(lock) ((void) 0)
+-#define __lock_init_recursive(lock) ((void) 0)
+-#define __lock_close(lock) ((void) 0)
+-#define __lock_close_recursive(lock) ((void) 0)
+-#define __lock_acquire(lock) ((void) 0)
+-#define __lock_acquire_recursive(lock) ((void) 0)
+-#define __lock_try_acquire(lock) ((void) 0)
+-#define __lock_try_acquire_recursive(lock) ((void) 0)
+-#define __lock_release(lock) ((void) 0)
+-#define __lock_release_recursive(lock) ((void) 0)
 +typedef struct __lock_t _LOCK_RECURSIVE_T;
-+
+ 
+-#else
 +typedef uint32_t _COND_T;
-+
+ 
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-struct __lock;
+-typedef struct __lock * _LOCK_T;
+-#define _LOCK_RECURSIVE_T _LOCK_T
+-
+-#define __LOCK_INIT(class,lock) extern struct __lock __lock_ ## lock; \
+-	class _LOCK_T lock = &__lock_ ## lock
+-#define __LOCK_INIT_RECURSIVE(class,lock) __LOCK_INIT(class,lock)
+-
+-extern void __retarget_lock_init(_LOCK_T *lock);
+-#define __lock_init(lock) __retarget_lock_init(&lock)
+-extern void __retarget_lock_init_recursive(_LOCK_T *lock);
+-#define __lock_init_recursive(lock) __retarget_lock_init_recursive(&lock)
+-extern void __retarget_lock_close(_LOCK_T lock);
+-#define __lock_close(lock) __retarget_lock_close(lock)
+-extern void __retarget_lock_close_recursive(_LOCK_T lock);
+-#define __lock_close_recursive(lock) __retarget_lock_close_recursive(lock)
+-extern void __retarget_lock_acquire(_LOCK_T lock);
+-#define __lock_acquire(lock) __retarget_lock_acquire(lock)
+-extern void __retarget_lock_acquire_recursive(_LOCK_T lock);
+-#define __lock_acquire_recursive(lock) __retarget_lock_acquire_recursive(lock)
+-extern int __retarget_lock_try_acquire(_LOCK_T lock);
+-#define __lock_try_acquire(lock) __retarget_lock_try_acquire(lock)
+-extern int __retarget_lock_try_acquire_recursive(_LOCK_T lock);
+-#define __lock_try_acquire_recursive(lock) \
+-  __retarget_lock_try_acquire_recursive(lock)
+-extern void __retarget_lock_release(_LOCK_T lock);
+-#define __lock_release(lock) __retarget_lock_release(lock)
+-extern void __retarget_lock_release_recursive(_LOCK_T lock);
+-#define __lock_release_recursive(lock) __retarget_lock_release_recursive(lock)
 +extern void __libc_lock_init(_LOCK_T *lock);
 +extern void __libc_lock_init_recursive(_LOCK_RECURSIVE_T *lock);
 +extern void __libc_lock_close(_LOCK_T *lock);
@@ -9374,7 +9435,12 @@ index 528904957..30cb099e6 100644
 +extern int __libc_cond_broadcast(_COND_T *cond);
 +extern int __libc_cond_wait(_COND_T *cond, _LOCK_T *lock, uint64_t timeout_ns);
 +extern int __libc_cond_wait_recursive(_COND_T *cond, _LOCK_RECURSIVE_T *lock, uint64_t timeout_ns);
-+
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+-#endif /* !defined(_RETARGETABLE_LOCKING) */
 +#define __LOCK_INITIALIZER ((_LOCK_T)0)
 +#define __LOCK_INITIALIZER_RECURSIVE ((_LOCK_RECURSIVE_T){__LOCK_INITIALIZER,0,0})
 +#define __COND_INITIALIZER ((_COND_T)0)
@@ -9433,66 +9499,6 @@ index 528904957..30cb099e6 100644
 +#define __cond_wait_recursive(NAME, LOCK, TIMEOUT) \
 +	__libc_cond_wait_recursive(&(NAME), &(LOCK), (TIMEOUT))
  
--#if !defined(_RETARGETABLE_LOCKING)
--
--typedef int _LOCK_T;
--typedef int _LOCK_RECURSIVE_T;
--
--#define __LOCK_INIT(class,lock) static int lock = 0;
--#define __LOCK_INIT_RECURSIVE(class,lock) static int lock = 0;
--#define __lock_init(lock) ((void) 0)
--#define __lock_init_recursive(lock) ((void) 0)
--#define __lock_close(lock) ((void) 0)
--#define __lock_close_recursive(lock) ((void) 0)
--#define __lock_acquire(lock) ((void) 0)
--#define __lock_acquire_recursive(lock) ((void) 0)
--#define __lock_try_acquire(lock) ((void) 0)
--#define __lock_try_acquire_recursive(lock) ((void) 0)
--#define __lock_release(lock) ((void) 0)
--#define __lock_release_recursive(lock) ((void) 0)
--
--#else
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--struct __lock;
--typedef struct __lock * _LOCK_T;
--#define _LOCK_RECURSIVE_T _LOCK_T
--
--#define __LOCK_INIT(class,lock) extern struct __lock __lock_ ## lock; \
--	class _LOCK_T lock = &__lock_ ## lock
--#define __LOCK_INIT_RECURSIVE(class,lock) __LOCK_INIT(class,lock)
--
--extern void __retarget_lock_init(_LOCK_T *lock);
--#define __lock_init(lock) __retarget_lock_init(&lock)
--extern void __retarget_lock_init_recursive(_LOCK_T *lock);
--#define __lock_init_recursive(lock) __retarget_lock_init_recursive(&lock)
--extern void __retarget_lock_close(_LOCK_T lock);
--#define __lock_close(lock) __retarget_lock_close(lock)
--extern void __retarget_lock_close_recursive(_LOCK_T lock);
--#define __lock_close_recursive(lock) __retarget_lock_close_recursive(lock)
--extern void __retarget_lock_acquire(_LOCK_T lock);
--#define __lock_acquire(lock) __retarget_lock_acquire(lock)
--extern void __retarget_lock_acquire_recursive(_LOCK_T lock);
--#define __lock_acquire_recursive(lock) __retarget_lock_acquire_recursive(lock)
--extern int __retarget_lock_try_acquire(_LOCK_T lock);
--#define __lock_try_acquire(lock) __retarget_lock_try_acquire(lock)
--extern int __retarget_lock_try_acquire_recursive(_LOCK_T lock);
--#define __lock_try_acquire_recursive(lock) \
--  __retarget_lock_try_acquire_recursive(lock)
--extern void __retarget_lock_release(_LOCK_T lock);
--#define __lock_release(lock) __retarget_lock_release(lock)
--extern void __retarget_lock_release_recursive(_LOCK_T lock);
--#define __lock_release_recursive(lock) __retarget_lock_release_recursive(lock)
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* !defined(_RETARGETABLE_LOCKING) */
--
 -#endif /* __SYS_LOCK_H__ */
 +#endif // __SYS_LOCK_H__
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h

dka64/scripts/build-gcc.sh

@@ -64,7 +64,7 @@ then
 		--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 14" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; 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/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-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-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

@@ -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,7 +51,7 @@ case "$VERSION" in
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=8.3.0
+    GCC_VER=9.2.0
     BINUTILS_VER=2.32
     NEWLIB_VER=3.1.0
     GDB_VER=8.2.1