always use --build

build-devkit.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 49
+#	devkitARM release 50
-#	devkitPPC release 32
+#	devkitPPC release 33
 #	devkitA64 release 12
 #---------------------------------------------------------------------------------
 
@@ -18,6 +18,9 @@ echo "Please note, these scripts are provided as a courtesy, toolchains built wi
 echo "are for personal use only and may not be distributed by entities other than devkitPro."
 echo "See http://devkitpro.org/wiki/Trademarks"
 echo
+echo "Users should use devkitPro pacman to maintain toolchain installations where possible"
+echo "See https://devkitpro.org/wiki/devkitPro_pacman"
+echo
 echo "Patches and improvements are of course welcome, please submit a PR"
 echo "https://github.com/devkitPro/buildscripts/pulls"
 echo
@@ -151,11 +154,13 @@ export MAKE
 TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
 export PATH=$PATH:$TOOLPATH/$package/bin
 
+CROSS_PARAMS="--build=`./config.guess`"
+
 if [ ! -z $CROSSBUILD ]; then
 	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
 	prefix=$INSTALLDIR/$CROSSBUILD/$package
 	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
-	CROSS_PARAMS="--build=`./config.guess` --host=$CROSSBUILD"
+	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
 	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
 else
 	toolsprefix=$INSTALLDIR/tools

dka64/rules/base_rules

@@ -33,8 +33,8 @@ include $(DEVKITPRO)/devkitA64/base_tools
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef
 

dkarm-eabi/crtls/3dsx.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/3dsx_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
 @---------------------------------------------------------------------------------
 @ 3DS processor selection
 @---------------------------------------------------------------------------------

dkarm-eabi/crtls/dldi.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_arm7.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_arm7_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
 @---------------------------------------------------------------------------------
 	.section ".crt0","ax"
 	.global _start

dkarm-eabi/crtls/ds_arm7_iwram.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_arm7_vram.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_arm9.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_arm9.mem

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 MEMORY {
 	ewram	: ORIGIN = 0x02000000, LENGTH = 4M - 512k
 	dtcm	: ORIGIN = 0x0b000000, LENGTH = 16K

dkarm-eabi/crtls/ds_arm9_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
 @---------------------------------------------------------------------------------
 @ DS processor selection
 @---------------------------------------------------------------------------------

dkarm-eabi/crtls/ds_cart.ld

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)

dkarm-eabi/crtls/ds_cart_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
 @---------------------------------------------------------------------------------
 	.section ".crt0","ax"
 	.global _start

dkarm-eabi/crtls/dsi_arm9.mem

@@ -1,3 +1,8 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
 MEMORY {
 	ewram	: ORIGIN = 0x02000000, LENGTH = 15M - 512k
 	dtcm	: ORIGIN = 0x0b000000, LENGTH = 16K

dkarm-eabi/crtls/er_crt0.s

@@ -3,6 +3,10 @@
 @---------------------------------------------------------------------------------
 @ author  : tim schuerewegen
 @ version : 1.0
+@---------------------------------------------------------------------------------
+@	This Source Code Form is subject to the terms of the Mozilla Public License,
+@	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+@	obtain one at https://mozilla.org/MPL/2.0/.
 @---------------------------------------------------------------------------------
 	.section	".crt0","ax"
 	.global     _start

dkarm-eabi/crtls/gba_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
 	.section	".crt0","ax"
 	.global     _start
 	.align

dkarm-eabi/crtls/gp32_crt0.s

@@ -1,3 +1,9 @@
+/*--------------------------------------------------------------------------------
+	This Source Code Form is subject to the terms of the Mozilla Public License,
+	v. 2.0. If a copy of the MPL was not distributed with this file, You can
+	obtain one at https://mozilla.org/MPL/2.0/.
+--------------------------------------------------------------------------------*/
+
     .section	".crt0","ax"
 	.code 32
 	.align

dkarm-eabi/patches/gcc-8.2.0.patch

@@ -1,7 +1,8 @@
-diff -NBaur gcc-8.1.0/gcc/config/arm/arm-cpus.in gcc-8.1.0-arm/gcc/config/arm/arm-cpus.in
+diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
---- gcc-8.1.0/gcc/config/arm/arm-cpus.in	2018-01-11 15:21:26.000000000 +0000
+index 545321b0bbe..63ed77af8fd 100644
-+++ gcc-8.1.0-arm/gcc/config/arm/arm-cpus.in	2018-05-11 01:05:33.648236777 +0000
+--- a/gcc/config/arm/arm-cpus.in
-@@ -393,7 +393,7 @@
++++ b/gcc/config/arm/arm-cpus.in
+@@ -395,7 +395,7 @@ begin arch armv6k
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -10,9 +11,10 @@ diff -NBaur gcc-8.1.0/gcc/config/arm/arm-cpus.in gcc-8.1.0-arm/gcc/config/arm/ar
   option fp add VFPv2 FP_DBL
   optalias vfpv2 fp
   option nofp remove ALL_FP
-diff -NBaur gcc-8.1.0/gcc/config/arm/t-arm-elf gcc-8.1.0-arm/gcc/config/arm/t-arm-elf
+diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
---- gcc-8.1.0/gcc/config/arm/t-arm-elf	2018-01-11 15:21:26.000000000 +0000
+index 9ec5bf065ac..9ab3ffb109d 100644
-+++ gcc-8.1.0-arm/gcc/config/arm/t-arm-elf	2018-05-10 23:15:13.124566279 +0000
+--- 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-2017 Free Software Foundation, Inc.
@@ -105,25 +107,22 @@ diff -NBaur gcc-8.1.0/gcc/config/arm/t-arm-elf gcc-8.1.0-arm/gcc/config/arm/t-ar
 -
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7a_fps), \
 -		          march?armv7+fp=march?armv7-a+$(FPARCH))
- 
+-
 -MULTILIB_MATCHES     += $(foreach FPARCH, $(v7ve_fps), \
 -		          march?armv7+fp=march?armv7ve+$(FPARCH))
-+MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
+-
- 
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
- 
+-
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
-+MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
+-
-+MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
- 
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
- 
+-
 -# PART 4 - Reuse rules
  
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
@@ -135,6 +134,14 @@ diff -NBaur gcc-8.1.0/gcc/config/arm/t-arm-elf gcc-8.1.0-arm/gcc/config/arm/t-ar
 -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
@@ -202,9 +209,10 @@ diff -NBaur gcc-8.1.0/gcc/config/arm/t-arm-elf gcc-8.1.0-arm/gcc/config/arm/t-ar
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm600
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm610
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm620
-diff -NBaur gcc-8.1.0/gcc/config/arm/unknown-elf.h gcc-8.1.0-arm/gcc/config/arm/unknown-elf.h
+diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
---- gcc-8.1.0/gcc/config/arm/unknown-elf.h	2018-01-03 10:03:58.000000000 +0000
+index 12dd0931b08..59584fe64bc 100644
-+++ gcc-8.1.0-arm/gcc/config/arm/unknown-elf.h	2018-05-10 23:01:02.432676190 +0000
+--- a/gcc/config/arm/unknown-elf.h
++++ b/gcc/config/arm/unknown-elf.h
 @@ -29,7 +29,7 @@
  #endif
  
@@ -225,10 +233,11 @@ diff -NBaur gcc-8.1.0/gcc/config/arm/unknown-elf.h gcc-8.1.0-arm/gcc/config/arm/
 +#undef NO_IMPLICIT_EXTERN_C
 +#define NO_IMPLICIT_EXTERN_C
 +
-diff -NBaur gcc-8.1.0/gcc/gcc.c gcc-8.1.0-arm/gcc/gcc.c
+diff --git a/gcc/gcc.c b/gcc/gcc.c
---- gcc-8.1.0/gcc/gcc.c	2018-02-09 06:44:06.000000000 +0000
+index a716f708259..6a11011dba7 100644
-+++ gcc-8.1.0-arm/gcc/gcc.c	2018-05-10 23:01:02.440676328 +0000
+--- a/gcc/gcc.c
-@@ -786,6 +786,11 @@
++++ b/gcc/gcc.c
+@@ -786,6 +786,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -240,7 +249,7 @@ diff -NBaur gcc-8.1.0/gcc/gcc.c gcc-8.1.0-arm/gcc/gcc.c
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1081,6 +1086,7 @@
+@@ -1081,6 +1086,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;
@@ -248,7 +257,7 @@ diff -NBaur gcc-8.1.0/gcc/gcc.c gcc-8.1.0-arm/gcc/gcc.c
  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 @@
+@@ -1577,6 +1583,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),
@@ -256,19 +265,21 @@ diff -NBaur gcc-8.1.0/gcc/gcc.c gcc-8.1.0-arm/gcc/gcc.c
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff -NBaur gcc-8.1.0/libgcc/config/arm/t-bpabi gcc-8.1.0-arm/libgcc/config/arm/t-bpabi
+diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
---- gcc-8.1.0/libgcc/config/arm/t-bpabi	2012-08-17 15:06:06.000000000 +0000
+index dddddc7c444..c2502597953 100644
-+++ gcc-8.1.0-arm/libgcc/config/arm/t-bpabi	2018-05-10 23:01:02.440676328 +0000
+--- a/libgcc/config/arm/t-bpabi
-@@ -17,4 +17,4 @@
++++ b/libgcc/config/arm/t-bpabi
+@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
  # On ARM, specifying -fnon-call-exceptions will needlessly pull in
  # the unwinder in simple programs which use 64-bit division.  Omitting
  # the option is safe.
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
-diff -NBaur gcc-8.1.0/libgcc/crtstuff.c gcc-8.1.0-arm/libgcc/crtstuff.c
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
---- gcc-8.1.0/libgcc/crtstuff.c	2018-01-03 10:03:58.000000000 +0000
+index 5e894455e16..f81c9c6a64c 100644
-+++ gcc-8.1.0-arm/libgcc/crtstuff.c	2018-05-10 23:01:02.440676328 +0000
+--- a/libgcc/crtstuff.c
-@@ -47,7 +47,7 @@
++++ 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
@@ -277,15 +288,3 @@ diff -NBaur gcc-8.1.0/libgcc/crtstuff.c gcc-8.1.0-arm/libgcc/crtstuff.c
  /* 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.  */
-diff -NBaur gcc-8.1.0/libgcc/Makefile.in gcc-8.1.0-arm/libgcc/Makefile.in
---- gcc-8.1.0/libgcc/Makefile.in	2018-01-03 10:03:58.000000000 +0000
-+++ gcc-8.1.0-arm/libgcc/Makefile.in	2018-05-10 23:01:02.440676328 +0000
-@@ -847,7 +847,7 @@
- # libgcc_eh.a, only LIB2ADDEH matters.  If we do, only LIB2ADDEHSTATIC and
- # LIB2ADDEHSHARED matter.  (Usually all three are identical.)
- 
--c_flags := -fexceptions
-+c_flags := -fno-exceptions
- 
- ifeq ($(enable_shared),yes)
- 

dkarm-eabi/patches/gdb-8.2.patch

@@ -1,29 +1,7 @@
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
+diff -NBaur gdb-8.2/gdb/arm-3ds-tdep.c gdb-8.2-3ds/gdb/arm-3ds-tdep.c
-index 1d2dbaf3f7..2d24f09c1b 100644
+--- gdb-8.2/gdb/arm-3ds-tdep.c	1970-01-01 01:00:00.000000000 +0100
---- a/gdb/Makefile.in
++++ gdb-8.2-3ds/gdb/arm-3ds-tdep.c	2018-11-15 22:55:21.916968907 +0000
-+++ b/gdb/Makefile.in
+@@ -0,0 +1,157 @@
-@@ -779,6 +779,7 @@ ALL_64_TARGET_OBS = \
- ALL_TARGET_OBS = \
- 	arc-tdep.o \
- 	arm.o \
-+	arm-3ds-tdep.o \
- 	arm-bsd-tdep.o \
- 	arm-get-next-pcs.o \
- 	arm-linux.o \
-@@ -2487,6 +2488,7 @@ ALLDEPFILES = \
- 	amd64-tdep.c \
- 	arc-tdep.c \
- 	arm.c \
-+	arm-3ds-tdep.c \
- 	arm-bsd-tdep.c \
- 	arm-get-next-pcs.c \
- 	arm-linux.c \
-diff --git a/gdb/arm-3ds-tdep.c b/gdb/arm-3ds-tdep.c
-new file mode 100644
-index 0000000000..ad014e28db
---- /dev/null
-+++ b/gdb/arm-3ds-tdep.c
-@@ -0,0 +1,197 @@
 +/* Target-dependent code for 3DS. */
 +
 +/* This uses code from GDB, which license is: */
@@ -95,48 +73,11 @@ index 0000000000..ad014e28db
 +  return next_pc;
 +}
 +
-+static VEC (CORE_ADDR) *
-+arm_3ds_software_single_step (struct regcache *regcache)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct arm_get_next_pcs next_pcs_ctx;
-+  CORE_ADDR pc;
-+  int i;
-+  VEC (CORE_ADDR) *next_pcs = NULL;
-+  struct cleanup *old_chain;
-+
-+  /* If the target does have hardware single step, GDB doesn't have
-+     to bother software single step.  */
-+  if (target_can_do_single_step () == 1)
-+    return NULL;
-+
-+  old_chain = make_cleanup (VEC_cleanup (CORE_ADDR), &next_pcs);
-+
-+  arm_get_next_pcs_ctor (&next_pcs_ctx,
-+			 &arm_3ds_get_next_pcs_ops,
-+			 gdbarch_byte_order (gdbarch),
-+			 gdbarch_byte_order_for_code (gdbarch),
-+			 1,
-+			 regcache);
-+
-+  next_pcs = arm_get_next_pcs (&next_pcs_ctx);
-+
-+  for (i = 0; VEC_iterate (CORE_ADDR, next_pcs, i, pc); i++)
-+    {
-+      pc = gdbarch_addr_bits_remove (gdbarch, pc);
-+      VEC_replace (CORE_ADDR, next_pcs, i, pc);
-+    }
-+
-+  discard_cleanups (old_chain);
-+
-+  return next_pcs;
-+}
-+
 +static LONGEST
 +arm_3ds_get_syscall_number (struct gdbarch *gdbarch,
-+			      ptid_t ptid)
++			      thread_info *thread)
 +{
-+  struct regcache *regs = get_thread_regcache (ptid);
++  struct regcache *regs = get_thread_regcache (thread);
 +
 +  ULONGEST pc;
 +  ULONGEST cpsr;
@@ -205,42 +146,35 @@ index 0000000000..ad014e28db
 +  tdep->fp_model = ARM_FLOAT_VFP;
 +
 +  /* Single stepping.  */
-+  set_gdbarch_software_single_step (gdbarch, arm_3ds_software_single_step);
++  set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
 +
 +  /* `catch syscall' */
 +  set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
 +  set_gdbarch_get_syscall_number (gdbarch, arm_3ds_get_syscall_number);
 +}
 +
-+/* Provide a prototype to silence -Wmissing-prototypes.  */
-+extern initialize_file_ftype _initialize_arm_3ds_tdep;
-+
 +void
 +_initialize_arm_3ds_tdep (void)
 +{
 +  gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
 +                          arm_3ds_init_abi);
 +}
-diff --git a/gdb/configure.tgt b/gdb/configure.tgt
+diff -NBaur gdb-8.2/gdb/configure.tgt gdb-8.2-3ds/gdb/configure.tgt
-index fdcb7b1d69..d8fd1622b8 100644
+--- gdb-8.2/gdb/configure.tgt	2018-09-05 08:44:28.000000000 +0100
---- a/gdb/configure.tgt
++++ gdb-8.2-3ds/gdb/configure.tgt	2018-11-15 22:47:17.337689978 +0000
-+++ b/gdb/configure.tgt
+@@ -61,7 +61,7 @@
-@@ -119,8 +119,8 @@ arm*-*-symbianelf*)
- 	gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o arm-symbian-tdep.o"
- 	;;
- arm*-*-*)
--	# Target: ARM embedded system
--	gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o"
-+	# Target: ARM embedded system (+ 3DS)
-+	gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o arm-3ds-tdep.o"
- 	gdb_sim=../sim/arm/libsim.a
  	;;
  
-diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
+ arm*-*-*)
-index 304d4b05c0..2cf8986d3a 100644
+-	cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o";;
---- a/gdb/data-directory/Makefile.in
++	cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o arm-3ds-tdep.o";;
-+++ b/gdb/data-directory/Makefile.in
+ 
-@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
+ hppa*-*-*)
+ 	# Target: HP PA-RISC
+diff -NBaur gdb-8.2/gdb/data-directory/Makefile.in gdb-8.2-3ds/gdb/data-directory/Makefile.in
+--- gdb-8.2/gdb/data-directory/Makefile.in	2018-01-05 04:07:23.000000000 +0000
++++ gdb-8.2-3ds/gdb/data-directory/Makefile.in	2018-11-15 22:42:36.840956065 +0000
+@@ -63,7 +63,7 @@
  	sparc-linux.xml \
  	sparc64-linux.xml
  
@@ -249,11 +183,10 @@ index 304d4b05c0..2cf8986d3a 100644
  
  PYTHON_DIR = python
  PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
-diff --git a/gdb/defs.h b/gdb/defs.h
+diff -NBaur gdb-8.2/gdb/defs.h gdb-8.2-3ds/gdb/defs.h
-index a0b586f401..a1508fd5b3 100644
+--- gdb-8.2/gdb/defs.h	2018-09-05 08:27:32.000000000 +0100
---- a/gdb/defs.h
++++ gdb-8.2-3ds/gdb/defs.h	2018-11-15 22:42:36.840956065 +0000
-+++ b/gdb/defs.h
+@@ -495,6 +495,7 @@
-@@ -604,6 +604,7 @@ enum gdb_osabi
    GDB_OSABI_LYNXOS178,
    GDB_OSABI_NEWLIB,
    GDB_OSABI_SDE,
@@ -261,11 +194,29 @@ index a0b586f401..a1508fd5b3 100644
  
    GDB_OSABI_INVALID		/* keep this last */
  };
-diff --git a/gdb/osabi.c b/gdb/osabi.c
+diff -NBaur gdb-8.2/gdb/Makefile.in gdb-8.2-3ds/gdb/Makefile.in
-index 84fa9c0273..c1c4bb1672 100644
+--- gdb-8.2/gdb/Makefile.in	2018-09-05 08:44:28.000000000 +0100
---- a/gdb/osabi.c
++++ gdb-8.2-3ds/gdb/Makefile.in	2018-11-15 22:45:01.628931262 +0000
-+++ b/gdb/osabi.c
+@@ -684,6 +684,7 @@
-@@ -79,6 +79,7 @@ static const struct osabi_names gdb_osabi_names[] =
+ 	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 @@
+ 	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/gdb/osabi.c gdb-8.2-3ds/gdb/osabi.c
+--- gdb-8.2/gdb/osabi.c	2018-09-05 08:27:13.000000000 +0100
++++ gdb-8.2-3ds/gdb/osabi.c	2018-11-15 22:42:36.840956065 +0000
+@@ -80,6 +80,7 @@
    { "LynxOS178", NULL },
    { "Newlib", NULL },
    { "SDE", NULL },
@@ -273,11 +224,9 @@ index 84fa9c0273..c1c4bb1672 100644
  
    { "<invalid>", NULL }
  };
-diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
+diff -NBaur gdb-8.2/gdb/syscalls/arm-3ds.xml gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml
-new file mode 100644
+--- gdb-8.2/gdb/syscalls/arm-3ds.xml	1970-01-01 01:00:00.000000000 +0100
-index 0000000000..48780b7bd5
++++ gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml	2018-11-15 22:42:36.840956065 +0000
---- /dev/null
-+++ b/gdb/syscalls/arm-3ds.xml
 @@ -0,0 +1,159 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
@@ -438,4 +387,3 @@ index 0000000000..48780b7bd5
 +  <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
 +
 +</syscalls_info>
-

dkarm-eabi/patches/newlib-3.0.0.patch

@@ -7531,7 +7531,7 @@ index 2900b332f..6efb54eb3 100644
  #ifdef __rtems__
 diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
 new file mode 100644
-index 000000000..ee14d2610
+index 000000000..dfed4107e
 --- /dev/null
 +++ b/newlib/libc/include/sys/iosupport.h
 @@ -0,0 +1,112 @@
@@ -7553,7 +7553,7 @@ index 000000000..ee14d2610
 +	STD_IN,
 +	STD_OUT,
 +	STD_ERR,
-+	STD_MAX = 16
++	STD_MAX = 35
 +};
 +
 +

dkarm-eabi/rules/base_rules

@@ -104,8 +104,8 @@ export PORTLIBS_PATH	:=	$(DEVKITPRO)/portlibs
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef
 

dkarm-eabi/scripts/build-gcc.sh

@@ -12,7 +12,7 @@ if [ ! -f configured-binutils ]
 then
 	CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
         --prefix=$prefix --target=$target --disable-nls --disable-werror \
-	--enable-lto --enable-plugins --enable-gold \
+	--enable-lto --enable-plugins \
 	--enable-poison-system-directories \
 	$CROSS_PARAMS \
         || { echo "Error configuring binutils"; exit 1; }
@@ -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 49" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 50" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }

dkppc/patches/binutils-2.31.1.patch

@@ -1,7 +1,7 @@
-diff -NBaur binutils-2.30/opcodes/ppc-opc.c binutils-2.30-ppc/opcodes/ppc-opc.c
+diff -NBaur binutils-2.31.1/opcodes/ppc-opc.c binutils-2.31.1-ppc/opcodes/ppc-opc.c
---- binutils-2.30/opcodes/ppc-opc.c	2018-01-13 13:31:16.000000000 +0000
+--- binutils-2.31.1/opcodes/ppc-opc.c	2018-06-24 19:38:58.000000000 +0100
-+++ binutils-2.30-ppc/opcodes/ppc-opc.c	2018-05-27 22:33:42.302025484 +0100
++++ binutils-2.31.1-ppc/opcodes/ppc-opc.c	2018-11-01 10:59:42.814553627 +0000
-@@ -3488,7 +3488,7 @@
+@@ -3501,7 +3501,7 @@
  #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
  		 | PPC_OPCODE_TITAN)
  #define BOOKE	PPC_OPCODE_BOOKE

dkppc/patches/gcc-8.2.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 a5defb0..d714072 100644
+index 532c33f4c2b..bb87330bbbe 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2459,7 +2459,7 @@ powerpc-xilinx-eabi*)
+@@ -2461,7 +2461,7 @@ powerpc-xilinx-eabi*)
  	use_gcc_stdint=wrap
  	;;
  powerpc-*-eabi*)
@@ -23,11 +23,24 @@ index a5defb0..d714072 100644
  	extra_options="${extra_options} rs6000/sysv4.opt"
  	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
  	use_gcc_stdint=wrap
+diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
+index f46e797d610..fd39e64c38d 100644
+--- a/gcc/config/newlib-stdint.h
++++ b/gcc/config/newlib-stdint.h
+@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* newlib uses 32-bit long in certain cases for all non-SPU
+    targets.  */
+ #ifndef STDINT_LONG32
+-#define STDINT_LONG32 (LONG_TYPE_SIZE == 32)
++#define STDINT_LONG32 0
+ #endif
+ 
+ #define SIG_ATOMIC_TYPE "int"
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index b9b58a8..7c86ac6 100644
+index b83b304e3eb..b85359edcfc 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
-@@ -205,6 +205,7 @@
+@@ -212,6 +212,7 @@
    { "asm_cpu_476",		ASM_CPU_476_SPEC },			\
    SUBTARGET_EXTRA_SPECS
  
@@ -35,7 +48,7 @@ index b9b58a8..7c86ac6 100644
  /* -mcpu=native handling only makes sense with compiler running on
     an PowerPC chip.  If changing this condition, also change
     the condition in driver-rs6000.c.  */
-@@ -219,6 +220,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
  #else
  #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
  #endif
@@ -45,7 +58,7 @@ index b9b58a8..7c86ac6 100644
  #ifndef CC1_CPU_SPEC
  #ifdef HAVE_LOCAL_CPU_DETECT
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index bb19d0d..ff5f80b 100644
+index bb19d0dcd41..ff5f80b7298 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -565,7 +565,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
@@ -221,7 +234,7 @@ index bb19d0d..ff5f80b 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..9451447 100644
+index 34fea0ddd08..9451447fde0 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
 @@ -124,6 +124,30 @@ mads
@@ -256,7 +269,7 @@ index 34fea0d..9451447 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 6121e163259..6584112e6a1 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -11692,7 +11692,7 @@ case ${enable_threads} in
@@ -269,7 +282,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 b066cc609e1..c42b3ef5fc6 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -1611,7 +1611,7 @@ case ${enable_threads} in
@@ -282,7 +295,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 @@
@@ -300,7 +313,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 @@
@@ -319,7 +332,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 @@
@@ -674,7 +687,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 @@
@@ -864,7 +877,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 @@
@@ -874,7 +887,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_}"
@@ -886,7 +899,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
@@ -898,7 +911,7 @@ 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 ba094be..ac53ee6 100755
+index fbc9daeb195..90c15adda62 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
 @@ -15178,6 +15178,7 @@ $as_echo "$target_thread_file" >&6; }

dkppc/rules/base_rules

@@ -37,9 +37,9 @@ include $(DEVKITPPC)/base_tools
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s -a 32 $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef
 
 

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 32" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 33" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \

select_toolchain.sh

@@ -30,21 +30,21 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=8.1.0
+    GCC_VER=8.2.0
-    BINUTILS_VER=2.30
+    BINUTILS_VER=2.31.1
     NEWLIB_VER=3.0.0
-    GDB_VER=8.0
+    GDB_VER=8.2
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=8.1.0
+    GCC_VER=8.2.0
-    BINUTILS_VER=2.30
+    BINUTILS_VER=2.31.1
     MN_BINUTILS_VER=2.17
     NEWLIB_VER=3.0.0
-    GDB_VER=8.0.1
+    GDB_VER=8.2
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi