devkitARM: remove old gcc patch

build-devkit.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 52
+#	devkitARM release 53-1
 #	devkitPPC release 35
 #	devkitA64 release 13
 #---------------------------------------------------------------------------------
@@ -28,17 +28,10 @@ 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
@@ -48,13 +41,9 @@ 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
@@ -64,7 +53,6 @@ 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,12 +206,6 @@ 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
@@ -235,8 +217,6 @@ 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"
@@ -244,8 +224,6 @@ 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
@@ -258,7 +236,7 @@ else
 fi
 
 cd "$SRCDIR"
-for archive in $archives $targetarchives $hostarchives
+for archive in $archives $hostarchives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
@@ -279,16 +257,6 @@ if [ $VERSION -eq 2 ]; then
 	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/' )
@@ -306,10 +274,6 @@ if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; the
  . $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
-  . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
-fi
-
 cd $BUILDSCRIPTDIR
 
 if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then

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/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; }

dkarm-eabi/patches/gcc-9.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 3a55f6ac6d2..1a16dcc1c74 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
-@@ -401,7 +401,7 @@ begin arch armv6k
+@@ -352,7 +352,7 @@ begin arch armv6k
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -12,16 +12,16 @@ 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 8911d489f14..b1976386bab 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
 @@ -1,4 +1,4 @@
--# Copyright (C) 1998-2018 Free Software Foundation, Inc.
+-# Copyright (C) 1998-2019 Free Software Foundation, Inc.
 +# Copyright (C) 1998-2017 Free Software Foundation, Inc.
  #
  # This file is part of GCC.
  #
-@@ -16,110 +16,83 @@
+@@ -16,111 +16,14 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
  
@@ -48,14 +48,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
 -
 -# No floating point variants, require thumb1 softfp
 -all_nofp_t	:= armv6-m armv6s-m armv8-m.base
@@ -114,16 +115,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 +138,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 cf9ba6b4dc0..008d7555ecb 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
 @@ -29,7 +29,7 @@
@@ -222,22 +151,18 @@ 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.  */
-+#undef NO_IMPLICIT_EXTERN_C
-+#define NO_IMPLICIT_EXTERN_C
-+
 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
  
@@ -249,7 +174,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;
@@ -257,7 +182,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),
@@ -276,7 +201,7 @@ index dddddc7c444..c2502597953 100644
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 5e894455e16..f81c9c6a64c 100644
+index 4927a9f8977..2a79e3e137d 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
 @@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see

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

@@ -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

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 53" \
 		$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; }

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
-

select_toolchain.sh

@@ -30,7 +30,7 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=8.3.0
+    GCC_VER=9.1.0
     BINUTILS_VER=2.32
     NEWLIB_VER=3.1.0
     GDB_VER=8.2.1