restore (null) printing

.gitignore

@@ -1,7 +1,7 @@
 config.sh
 .devkitARM*
 .devkitPPC*
-.devkitPSP*
+.devkitA64*
 *.gz
 *.bz2
 *~

README.TXT

@@ -1,7 +1,7 @@
 devkitPro build scripts
 --------------------------
 
-This readme will guide you through building devkitARM, devkitPPC or devkitPSP
+This readme will guide you through building devkitARM, devkitPPC or devkitA64
 from source using a set of scripts.
 
 The windows versions of the toolchains are now cross compiled on linux using
@@ -26,19 +26,33 @@ http://www.multiprecision.org/
 sudo apt-get install libgmp-dev libmpfr-dev libmpc-dev
 
 Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib,
-and libusb. Again these are built as static libraries for ease of packaging
+expat, and libusb. Again these are built as static libraries for ease of
-but you can probably use the versions supplied by your distro.
+packaging but you can probably use the versions supplied by your distro.
 
 http://freeimage.sourceforge.net/
 http://www.zlib.net
 http://www.libusb.org
+http://expat.sourceforge.net/
+
+sudo apt-get install  libfreeimage-dev zlib1g-dev libusb-dev libexpat1-dev
 
-sudo apt-get install  libfreeimage-dev zlib1g-dev libusb-dev
 
 Building gxtexconv for cube/wii needs GL/gl.h which can be obtained with
 
 sudo apt-get install mesa-common-dev
 
+Tools for devkitA64 require liblz4.
+
+http://lz4.github.io/lz4/
+
+sudo apt-get install liblz4-dev 
+
+
+For building the OSX versions we install the Xcode commandline tools and build
+pkg-config from source as well as static versions of the libraries listed above.
+This helps keep the dependencies to a minimum so end users can use the tools
+with only Xcode command line tools to obtain make.
+
 To avoid having to manually answer prompts during the build the script will
 read variables from config.sh if it exists. Copy config.sh.sample to config.sh
 and set the variables as appropriate for your build.
@@ -85,16 +99,6 @@ to use the built in crt0 and linkscript use powerpc-eabi-gcc to link your projec
 using the command line switch -mgcn for a bare bones system, -mogc to use libogc and
 the multi-threaded microkernel for gamecube, -mrvl for wii, -mwup for wii u.
 
-Using devkitPSP
----------------
-
-All you need to do now to use devkitPSP is make sure that your freshly built tools
-are in your PATH, something like this;
-
-export PATH=$PATH:<path to devkitPSP>/bin
-
-(Obviously replace <path to devkitPSP> with the full path to the devkitPSP
-installation directory)
 
 Getting started
 ---------------

build-devkit.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 46
+#	devkitARM release 47
 #	devkitPPC release 29-1
+#	devkitA64 alpha 7
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -23,39 +24,44 @@ echo "https://sourceforge.net/tracker/?group_id=114505&atid=668553"
 echo
 
 
-GENERAL_TOOLS_VER=1.0.0
+GENERAL_TOOLS_VER=1.0.1
 
 LIBGBA_VER=0.5.0
 GBATOOLS_VER=1.0.0
 
 LIBNDS_VER=1.6.2
 DEFAULT_ARM7_VER=0.7.0
-DSWIFI_VER=0.4.0
+DSWIFI_VER=0.4.1
-MAXMOD_VER=1.0.10
+MAXMOD_VER=1.0.11
 FILESYSTEM_VER=0.9.13
 LIBFAT_VER=1.1.0
 DSTOOLS_VER=1.1.0
 GRIT_VER=0.8.14
-NDSTOOL_VER=2.0.1
+NDSTOOL_VER=2.0.3
 DLDITOOL_VER=1.24.0
 MMUTIL_VER=1.8.6
 
 DFU_UTIL_VER=0.9.1
-STLINK_VER=1.2.2
+STLINK_VER=1.2.3
 
 GAMECUBE_TOOLS_VER=1.0.1
 LIBOGC_VER=1.8.16
 WIILOAD_VER=0.5.1
 
-LIBCTRU_VER=1.2.0
+LIBCTRU_VER=1.3.0
-CITRO3D_VER=1.2.0
+CITRO3D_VER=1.3.0
 TOOLS3DS_VER=1.1.4
-LINK3DS_VER=0.5.1
+LINK3DS_VER=0.5.2
-PICASSO_VER=2.5.0
+PICASSO_VER=2.6.2
 
-GP32_TOOLS_VER=1.0.2
+GP32_TOOLS_VER=1.0.3
 LIBMIRKO_VER=0.9.7
 
+SWITCH_TOOLS_VER=1.1.1
+LIBNX_VER=1.0.0
+
+OSXMIN=${OSXMIN:-10.9}
+
 #---------------------------------------------------------------------------------
 function extract_and_patch {
 #---------------------------------------------------------------------------------
@@ -165,8 +171,16 @@ PLATFORM=`uname -s`
 
 case $PLATFORM in
 	Darwin )
-		cflags="-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -I/usr/local/include"
+		cflags="-mmacosx-version-min=${OSXMIN} -I/usr/local/include"
-		ldflags="-mmacosx-version-min=10.5 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -L/usr/local/lib"
+		ldflags="-mmacosx-version-min=${OSXMIN} -L/usr/local/lib"
+		if [ "x${OSXSDKPATH}x" != "xx" ]; then
+			cflags="$cflags -isysroot ${OSXSDKPATH}"
+			ldflags="$ldflags -Wl,-syslibroot,${OSXSDKPATH}"
+		fi
+		TESTCC=`cc -v 2>&1 | grep clang`
+		if [ "x${TESTCC}x" != "xx" ]; then
+			cflags="$cflags -fbracket-depth=512"
+		fi
     ;;
 	MINGW32* )
 		cflags="-D__USE_MINGW_ACCESS"
@@ -175,17 +189,18 @@ case $PLATFORM in
     ;;
 esac
 
+
 BUILDSCRIPTDIR=$(pwd)
 BUILDDIR=$(pwd)/.$package
+
 if [ ! -z $CROSSBUILD ]; then
 	BUILDDIR=$BUILDDIR-$CROSSBUILD
 fi
-DEVKITPRO_URL="http://downloads.sourceforge.net/devkitpro"
 
 patchdir=$(pwd)/$basedir/patches
 scriptdir=$(pwd)/$basedir/scripts
 
-archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.bz2"
+archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
 
 if [ $VERSION -eq 1 ]; then
 
@@ -210,6 +225,12 @@ if [ $VERSION -eq 2 ]; then
 	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $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
 	SRCDIR="$BUILD_DKPRO_SRCDIR"
@@ -222,7 +243,7 @@ for archive in $archives $targetarchives $hostarchives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
-		$FETCH http://downloads.sf.net/devkitpro/$archive || { echo "Error: Failed to download $archive"; exit 1; }
+		$FETCH https://github.com/devkitPro/buildscripts/releases/download/sources/$archive || { echo "Error: Failed to download $archive"; exit 1; }
 	fi
 done
 
@@ -233,7 +254,7 @@ cd $BUILDDIR
 extract_and_patch binutils $BINUTILS_VER bz2
 extract_and_patch gcc $GCC_VER bz2
 extract_and_patch newlib $NEWLIB_VER gz
-extract_and_patch gdb $GDB_VER bz2
+extract_and_patch gdb $GDB_VER xz
 
 if [ $VERSION -eq 2 ]; then
 	extract_and_patch binutils $MN_BINUTILS_VER bz2
@@ -265,15 +286,7 @@ if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo
 if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh || { echo "Error building crtls"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 
 if [ ! -z $CROSSBUILD ]; then
-	if [ $VERSION -ne 3 ]; then
+	cp -v	$CROSSBINPATH/*.dll $CROSSLIBPATH/*.dll $prefix/bin
-		cp -v $CROSSBINPATH/FreeImage.dll $prefix/bin
-	fi
-	if [ $VERSION -eq 1 ]; then
-		cp -v $CROSSBINPATH/libusb-1.0.dll $prefix/bin
-	fi
-	cp -v	$CROSSLIBPATH/libstdc++-6.dll \
-		$CROSSLIBPATH/libgcc_s_sjlj-1.dll \
-		$prefix/bin
 fi
 
 echo "stripping installed binaries"

config.sh.sample

@@ -9,7 +9,7 @@
 #   0: User selects manually
 #   1: devkitARM
 #   2: devkitPPC
-#   3: devkitPSP
+#   3: devkitA64
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_PACKAGE=0
 
@@ -22,7 +22,7 @@ BUILD_DKPRO_PACKAGE=0
 #---------------------------------------------------------------------------------
 # Path to previously downloaded source packages, comment if not specified
 #---------------------------------------------------------------------------------
-#BUILD_DKPRO_SRCDIR=/d/projects/archives
+#BUILD_DKPRO_SRCDIR=~/projects/archives
 
 #---------------------------------------------------------------------------------
 # MAKEFLAGS for building - use number of processors for jobs
@@ -38,3 +38,9 @@ BUILD_DKPRO_PACKAGE=0
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_AUTOMATED=0
 
+
+#---------------------------------------------------------------------------------
+# set OSX SDK path if needed
+#---------------------------------------------------------------------------------
+#export OSXSDKPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX10.12.sdk
+

cross-build-x86_64-w64-mingw32.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 export CROSSBUILD=x86_64-w64-mingw32
-export CROSSLIBPATH=/opt/x86_64-mingw-w64/mingw/lib
+export CROSSPATH=/opt/mingw64/mingw
-export CROSSBINPATH=/opt/x86_64-mingw-w64/mingw/bin
+export CROSSLIBPATH=$CROSSPATH/lib
-export PATH=/opt/x86_64-mingw-w64/bin:$PATH
+export CROSSBINPATH=$CROSSPATH/bin
-export PKG_CONFIG_PATH=$CROSSLIBPATH/pkgconfig
+export PATH=/opt/mingw64/bin:$PATH
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_LIBDIR=$CROSSLIBPATH/pkgconfig
 

dka64/patches/binutils-2.29.1.patch

@@ -0,0 +1,342 @@
+diff -Nbaur binutils-2.29.1-orig/bfd/elfnn-aarch64.c binutils-2.29.1-dka64/bfd/elfnn-aarch64.c
+--- binutils-2.29.1-orig/bfd/elfnn-aarch64.c	2017-09-05 14:12:46.000000000 +0100
++++ binutils-2.29.1-dka64/bfd/elfnn-aarch64.c	2017-10-22 06:58:57.711591457 +0100
+@@ -2097,6 +2097,12 @@
+   aarch64_stub_erratum_843419_veneer,
+ };
+ 
++/* Is an undefined weak symbol resolved to 0 ? */
++#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH)               \
++  ((EH)->root.root.type == bfd_link_hash_undefweak              \
++   && bfd_link_executable (INFO)                                \
++   && !(INFO)->dynamic_undefined_weak)
++
+ struct elf_aarch64_stub_hash_entry
+ {
+   /* Base hash table entry structure.  */
+@@ -6081,11 +6087,13 @@
+       Elf_Internal_Sym *sym;
+       asection *sec;
+       struct elf_link_hash_entry *h;
++      struct elf_aarch64_link_hash_entry *eh;
+       bfd_vma relocation;
+       bfd_reloc_status_type r;
+       arelent bfd_reloc;
+       char sym_type;
+       bfd_boolean unresolved_reloc = FALSE;
++      bfd_boolean resolved_to_zero = FALSE;
+       char *error_message = NULL;
+ 
+       r_symndx = ELFNN_R_SYM (rel->r_info);
+@@ -6225,6 +6233,10 @@
+ 					       h, &unresolved_reloc,
+ 					       save_addend, &addend, sym);
+ 
++      eh = (struct elf_aarch64_link_hash_entry *) h;
++      resolved_to_zero = (eh != NULL
++                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
++      
+       switch (elfNN_aarch64_bfd_reloc_from_type (r_type))
+ 	{
+ 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
+@@ -6248,7 +6260,7 @@
+ 	      need_relocs =
+ 		(bfd_link_pic (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6343,7 +6355,7 @@
+ 	      need_relocs =
+ 		(bfd_link_pic (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6392,7 +6404,7 @@
+ 	      bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
+ 
+ 	      need_relocs = (h == NULL
+-			     || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++			     || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 			     || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6891,6 +6903,26 @@
+   return FALSE;
+ }
+ 
++/* Remove undefined weak symbol from the dynamic symbol table if it
++   is resolved to 0.   */
++
++extern bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
++
++bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
++                             struct elf_link_hash_entry *h)
++{
++  if (h->dynindx != -1
++      && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
++    {
++      h->dynindx = -1;
++      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
++                              h->dynstr_index);
++    }
++  return TRUE;
++}
++
+ /* Adjust a symbol defined by a dynamic object and referenced by a
+    regular object.  The current definition is in some section of the
+    dynamic object, but we're not including those sections.  We have to
+@@ -8068,6 +8100,7 @@
+   struct elf_aarch64_link_hash_table *htab;
+   struct elf_aarch64_link_hash_entry *eh;
+   struct elf_dyn_relocs *p;
++  bfd_boolean resolved_to_zero;
+ 
+   /* An example of a bfd_link_hash_indirect symbol is versioned
+      symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
+@@ -8087,6 +8120,10 @@
+   info = (struct bfd_link_info *) inf;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
++  resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+      here if it is defined and referenced in a non-shared object.  */
+   if (h->type == STT_GNU_IFUNC
+@@ -8096,7 +8133,7 @@
+     {
+       /* Make sure this symbol is output as a dynamic symbol.
+          Undefined weak syms won't yet be marked as dynamic.  */
+-      if (h->dynindx == -1 && !h->forced_local
++      if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8130,6 +8167,11 @@
+ 	     of relaxing into these from the large model PLT entries.  */
+ 	  s->size += PLT_SMALL_ENTRY_SIZE;
+ 
++          /* There should be no PLT relocations against resolved undefined
++             weak symbols in the executable.  */
++          if (!resolved_to_zero)
++            {
++
+ 	  /* We also need to make an entry in the .got.plt section, which
+ 	     will be placed in the .got section by the linker script.  */
+ 	  htab->root.sgotplt->size += GOT_ENTRY_SIZE;
+@@ -8152,6 +8194,7 @@
+ 
+ 	  htab->root.srelplt->reloc_count++;
+ 	}
++	}
+       else
+ 	{
+ 	  h->plt.offset = (bfd_vma) - 1;
+@@ -8164,9 +8207,6 @@
+       h->needs_plt = 0;
+     }
+ 
+-  eh = (struct elf_aarch64_link_hash_entry *) h;
+-  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
+-
+   if (h->got.refcount > 0)
+     {
+       bfd_boolean dyn;
+@@ -8178,7 +8218,7 @@
+ 
+       /* Make sure this symbol is output as a dynamic symbol.
+          Undefined weak syms won't yet be marked as dynamic.  */
+-      if (dyn && h->dynindx == -1 && !h->forced_local
++      if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8192,7 +8232,7 @@
+ 	{
+ 	  h->got.offset = htab->root.sgot->size;
+ 	  htab->root.sgot->size += GOT_ENTRY_SIZE;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (bfd_link_pic (info)
+ 		  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+@@ -8225,7 +8265,7 @@
+ 	    }
+ 
+ 	  indx = h && h->dynindx != -1 ? h->dynindx : 0;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (bfd_link_pic (info)
+ 		  || indx != 0
+@@ -8291,7 +8331,7 @@
+          visibility.  */
+       if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
+ 	{
+-	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
++	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero)
+ 	    eh->dyn_relocs = NULL;
+ 
+ 	  /* Make sure undefined weak symbols are output as a dynamic
+@@ -8310,7 +8350,9 @@
+          symbols which turn out to need copy relocs or are not
+          dynamic.  */
+ 
+-      if (!h->non_got_ref
++      if (!(h->non_got_ref
++           || (h->root.type == bfd_link_hash_undefweak
++               && !resolved_to_zero))
+ 	  && ((h->def_dynamic
+ 	       && !h->def_regular)
+ 	      || (htab->root.dynamic_sections_created
+@@ -8321,6 +8363,7 @@
+ 	     Undefined weak syms won't yet be marked as dynamic.  */
+ 	  if (h->dynindx == -1
+ 	      && !h->forced_local
++	      && !resolved_to_zero
+ 	      && h->root.type == bfd_link_hash_undefweak
+ 	      && !bfd_elf_link_record_dynamic_symbol (info, h))
+ 	    return FALSE;
+@@ -8940,8 +8983,17 @@
+ 				     Elf_Internal_Sym *sym)
+ {
+   struct elf_aarch64_link_hash_table *htab;
++  struct elf_aarch64_link_hash_entry *eh;
++  bfd_boolean local_undefweak;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++
++  /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
++     resolved undefined weak symbols in executable so that their
++     references have value 0 at run-time.  */
++  local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   if (h->plt.offset != (bfd_vma) - 1)
+     {
+       asection *plt, *gotplt, *relplt;
+@@ -8976,7 +9028,7 @@
+ 	return FALSE;
+ 
+       elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
+-      if (!h->def_regular)
++      if (!local_undefweak && !h->def_regular)
+ 	{
+ 	  /* Mark the symbol as undefined, rather than as defined in
+ 	     the .plt section.  */
+@@ -8995,7 +9047,8 @@
+     }
+ 
+   if (h->got.offset != (bfd_vma) - 1
+-      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL)
++      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
++      && !local_undefweak)
+     {
+       Elf_Internal_Rela rela;
+       bfd_byte *loc;
+@@ -9489,6 +9542,9 @@
+ #define elf_backend_init_index_section		\
+   _bfd_elf_init_2_index_sections
+ 
++#define elf_backend_fixup_symbol		\
++  elfNN_aarch64_elf_fixup_symbol
++
+ #define elf_backend_finish_dynamic_sections	\
+   elfNN_aarch64_finish_dynamic_sections
+ 
+diff -Nbaur binutils-2.29.1-orig/ld/emulparams/aarch64elf32.sh binutils-2.29.1-dka64/ld/emulparams/aarch64elf32.sh
+--- binutils-2.29.1-orig/ld/emulparams/aarch64elf32.sh	2017-07-10 10:54:42.000000000 +0100
++++ binutils-2.29.1-dka64/ld/emulparams/aarch64elf32.sh	2017-10-22 06:58:57.719591510 +0100
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH="aarch64:ilp32"
+ MACHINE=
+ NOP=0
+diff -Nbaur binutils-2.29.1-orig/ld/emulparams/aarch64elf.sh binutils-2.29.1-dka64/ld/emulparams/aarch64elf.sh
+--- binutils-2.29.1-orig/ld/emulparams/aarch64elf.sh	2017-07-10 10:54:42.000000000 +0100
++++ binutils-2.29.1-dka64/ld/emulparams/aarch64elf.sh	2017-10-22 06:58:57.719591510 +0100
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH=aarch64
+ MACHINE=
+ NOP=0
+diff -Nbaur binutils-2.29.1-orig/ld/emultempl/aarch64elf.em binutils-2.29.1-dka64/ld/emultempl/aarch64elf.em
+--- binutils-2.29.1-orig/ld/emultempl/aarch64elf.em	2017-07-10 10:54:42.000000000 +0100
++++ binutils-2.29.1-dka64/ld/emultempl/aarch64elf.em	2017-10-22 06:58:57.719591510 +0100
+@@ -375,7 +375,7 @@
+   { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
+ '
+ 
+-PARSE_AND_LIST_OPTIONS='
++PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
+   fprintf (file, _("  --no-enum-size-warning      Don'\''t warn about objects with incompatible\n"
+ 		   "                                enum sizes\n"));
+   fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible"
+diff -Nbaur binutils-2.29.1-orig/ld/Makefile.am binutils-2.29.1-dka64/ld/Makefile.am
+--- binutils-2.29.1-orig/ld/Makefile.am	2017-07-10 10:54:42.000000000 +0100
++++ binutils-2.29.1-dka64/ld/Makefile.am	2017-10-22 06:58:57.719591510 +0100
+@@ -1654,19 +1654,23 @@
+   $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
+diff -Nbaur binutils-2.29.1-orig/ld/Makefile.in binutils-2.29.1-dka64/ld/Makefile.in
+--- binutils-2.29.1-orig/ld/Makefile.in	2017-09-15 12:38:08.000000000 +0100
++++ binutils-2.29.1-dka64/ld/Makefile.in	2017-10-22 06:58:57.719591510 +0100
+@@ -3219,18 +3219,22 @@
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \

dka64/patches/binutils-2.30.patch

@@ -0,0 +1,346 @@
+diff -NBaur binutils-2.30/bfd/elfnn-aarch64.c binutils-2.30-dka64/bfd/elfnn-aarch64.c
+--- binutils-2.30/bfd/elfnn-aarch64.c	2018-01-17 11:29:21.000000000 +0000
++++ binutils-2.30-dka64/bfd/elfnn-aarch64.c	2018-02-11 19:54:08.141257544 +0000
+@@ -2097,6 +2097,12 @@
+   aarch64_stub_erratum_843419_veneer,
+ };
+ 
++/* Is an undefined weak symbol resolved to 0 ? */
++#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH)               \
++  ((EH)->root.root.type == bfd_link_hash_undefweak              \
++   && bfd_link_executable (INFO)                                \
++   && !(INFO)->dynamic_undefined_weak)
++
+ struct elf_aarch64_stub_hash_entry
+ {
+   /* Base hash table entry structure.  */
+@@ -6088,11 +6094,13 @@
+       Elf_Internal_Sym *sym;
+       asection *sec;
+       struct elf_link_hash_entry *h;
++      struct elf_aarch64_link_hash_entry *eh;
+       bfd_vma relocation;
+       bfd_reloc_status_type r;
+       arelent bfd_reloc;
+       char sym_type;
+       bfd_boolean unresolved_reloc = FALSE;
++      bfd_boolean resolved_to_zero = FALSE;
+       char *error_message = NULL;
+ 
+       r_symndx = ELFNN_R_SYM (rel->r_info);
+@@ -6226,6 +6234,10 @@
+ 					       h, &unresolved_reloc,
+ 					       save_addend, &addend, sym);
+ 
++      eh = (struct elf_aarch64_link_hash_entry *) h;
++      resolved_to_zero = (eh != NULL
++                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
++      
+       switch (elfNN_aarch64_bfd_reloc_from_type (r_type))
+ 	{
+ 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
+@@ -6249,7 +6261,7 @@
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6344,7 +6356,7 @@
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6393,7 +6405,7 @@
+ 	      bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
+ 
+ 	      need_relocs = (h == NULL
+-			     || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++			     || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 			     || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6735,6 +6747,26 @@
+   return FALSE;
+ }
+ 
++/* Remove undefined weak symbol from the dynamic symbol table if it
++   is resolved to 0.   */
++
++extern bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
++
++bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
++                             struct elf_link_hash_entry *h)
++{
++  if (h->dynindx != -1
++      && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
++    {
++      h->dynindx = -1;
++      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
++                              h->dynstr_index);
++    }
++  return TRUE;
++}
++
+ /* Adjust a symbol defined by a dynamic object and referenced by a
+    regular object.  The current definition is in some section of the
+    dynamic object, but we're not including those sections.  We have to
+@@ -7928,6 +7960,7 @@
+   struct elf_aarch64_link_hash_table *htab;
+   struct elf_aarch64_link_hash_entry *eh;
+   struct elf_dyn_relocs *p;
++  bfd_boolean resolved_to_zero;
+ 
+   /* An example of a bfd_link_hash_indirect symbol is versioned
+      symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
+@@ -7947,6 +7980,10 @@
+   info = (struct bfd_link_info *) inf;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
++  resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+      here if it is defined and referenced in a non-shared object.  */
+   if (h->type == STT_GNU_IFUNC
+@@ -7956,7 +7993,7 @@
+     {
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (h->dynindx == -1 && !h->forced_local
++      if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -7990,6 +8027,11 @@
+ 	     of relaxing into these from the large model PLT entries.  */
+ 	  s->size += PLT_SMALL_ENTRY_SIZE;
+ 
++          /* There should be no PLT relocations against resolved undefined
++             weak symbols in the executable.  */
++          if (!resolved_to_zero)
++            {
++
+ 	  /* We also need to make an entry in the .got.plt section, which
+ 	     will be placed in the .got section by the linker script.  */
+ 	  htab->root.sgotplt->size += GOT_ENTRY_SIZE;
+@@ -8012,6 +8054,7 @@
+ 
+ 	  htab->root.srelplt->reloc_count++;
+ 	}
++	}
+       else
+ 	{
+ 	  h->plt.offset = (bfd_vma) - 1;
+@@ -8024,9 +8067,6 @@
+       h->needs_plt = 0;
+     }
+ 
+-  eh = (struct elf_aarch64_link_hash_entry *) h;
+-  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
+-
+   if (h->got.refcount > 0)
+     {
+       bfd_boolean dyn;
+@@ -8038,7 +8078,7 @@
+ 
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (dyn && h->dynindx == -1 && !h->forced_local
++      if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8052,7 +8092,7 @@
+ 	{
+ 	  h->got.offset = htab->root.sgot->size;
+ 	  htab->root.sgot->size += GOT_ENTRY_SIZE;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (bfd_link_pic (info)
+ 		  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
+@@ -8088,7 +8128,7 @@
+ 	    }
+ 
+ 	  indx = h && h->dynindx != -1 ? h->dynindx : 0;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (!bfd_link_executable (info)
+ 		  || indx != 0
+@@ -8154,7 +8194,7 @@
+ 	 visibility.  */
+       if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
+ 	{
+-	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
++	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
+ 	      || UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
+ 	    eh->dyn_relocs = NULL;
+ 
+@@ -8174,7 +8214,9 @@
+ 	 symbols which turn out to need copy relocs or are not
+ 	 dynamic.  */
+ 
+-      if (!h->non_got_ref
++      if (!(h->non_got_ref
++           || (h->root.type == bfd_link_hash_undefweak
++               && !resolved_to_zero))
+ 	  && ((h->def_dynamic
+ 	       && !h->def_regular)
+ 	      || (htab->root.dynamic_sections_created
+@@ -8185,6 +8227,7 @@
+ 	     Undefined weak syms won't yet be marked as dynamic.  */
+ 	  if (h->dynindx == -1
+ 	      && !h->forced_local
++	      && !resolved_to_zero
+ 	      && h->root.type == bfd_link_hash_undefweak
+ 	      && !bfd_elf_link_record_dynamic_symbol (info, h))
+ 	    return FALSE;
+@@ -8805,8 +8848,17 @@
+ 				     Elf_Internal_Sym *sym)
+ {
+   struct elf_aarch64_link_hash_table *htab;
++  struct elf_aarch64_link_hash_entry *eh;
++  bfd_boolean local_undefweak;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++
++  /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
++     resolved undefined weak symbols in executable so that their
++     references have value 0 at run-time.  */
++  local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   if (h->plt.offset != (bfd_vma) - 1)
+     {
+       asection *plt, *gotplt, *relplt;
+@@ -8841,7 +8893,7 @@
+ 	return FALSE;
+ 
+       elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
+-      if (!h->def_regular)
++      if (!local_undefweak && !h->def_regular)
+ 	{
+ 	  /* Mark the symbol as undefined, rather than as defined in
+ 	     the .plt section.  */
+@@ -8860,10 +8912,11 @@
+     }
+ 
+   if (h->got.offset != (bfd_vma) - 1
+-      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
++      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL 
+       /* Undefined weak symbol in static PIE resolves to 0 without
+ 	 any dynamic relocations.  */
+-      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
++      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
++      && !local_undefweak)
+     {
+       Elf_Internal_Rela rela;
+       bfd_byte *loc;
+@@ -9357,6 +9410,9 @@
+ #define elf_backend_init_index_section		\
+   _bfd_elf_init_2_index_sections
+ 
++#define elf_backend_fixup_symbol		\
++  elfNN_aarch64_elf_fixup_symbol
++
+ #define elf_backend_finish_dynamic_sections	\
+   elfNN_aarch64_finish_dynamic_sections
+ 
+diff -NBaur binutils-2.30/ld/emulparams/aarch64elf32.sh binutils-2.30-dka64/ld/emulparams/aarch64elf32.sh
+--- binutils-2.30/ld/emulparams/aarch64elf32.sh	2018-01-13 13:31:16.000000000 +0000
++++ binutils-2.30-dka64/ld/emulparams/aarch64elf32.sh	2018-02-11 19:48:08.997273556 +0000
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH="aarch64:ilp32"
+ MACHINE=
+ NOP=0
+diff -NBaur binutils-2.30/ld/emulparams/aarch64elf.sh binutils-2.30-dka64/ld/emulparams/aarch64elf.sh
+--- binutils-2.30/ld/emulparams/aarch64elf.sh	2018-01-13 13:31:16.000000000 +0000
++++ binutils-2.30-dka64/ld/emulparams/aarch64elf.sh	2018-02-11 19:48:09.009273555 +0000
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH=aarch64
+ MACHINE=
+ NOP=0
+diff -NBaur binutils-2.30/ld/emultempl/aarch64elf.em binutils-2.30-dka64/ld/emultempl/aarch64elf.em
+--- binutils-2.30/ld/emultempl/aarch64elf.em	2018-01-13 13:31:16.000000000 +0000
++++ binutils-2.30-dka64/ld/emultempl/aarch64elf.em	2018-02-11 19:48:09.009273555 +0000
+@@ -378,7 +378,7 @@
+   { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
+ '
+ 
+-PARSE_AND_LIST_OPTIONS='
++PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
+   fprintf (file, _("  --no-enum-size-warning      Don'\''t warn about objects with incompatible\n"
+ 		   "                                enum sizes\n"));
+   fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible"
+diff -NBaur binutils-2.30/ld/Makefile.am binutils-2.30-dka64/ld/Makefile.am
+--- binutils-2.30/ld/Makefile.am	2018-01-13 13:31:16.000000000 +0000
++++ binutils-2.30-dka64/ld/Makefile.am	2018-02-11 19:48:09.021273555 +0000
+@@ -1654,19 +1654,23 @@
+   $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
+diff -NBaur binutils-2.30/ld/Makefile.in binutils-2.30-dka64/ld/Makefile.in
+--- binutils-2.30/ld/Makefile.in	2018-01-27 15:03:10.000000000 +0000
++++ binutils-2.30-dka64/ld/Makefile.in	2018-02-11 19:48:09.037273554 +0000
+@@ -3219,18 +3219,22 @@
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \

dka64/patches/gcc-7.3.0.patch

@@ -0,0 +1,190 @@
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.c gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.c
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.c	2017-11-03 15:01:10.970890000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.c	2018-01-22 20:15:07.232099998 +0000
+@@ -10009,8 +10009,24 @@
+       || !register_operand (target, Pmode))
+     target = gen_reg_rtx (Pmode);
+ 
+-  /* Can return in any reg.  */
+-  emit_insn (gen_aarch64_load_tp_hard (target));
++  if (TARGET_HARD_TP)
++    {
++      /* Can return in any reg.  */
++      emit_insn (gen_aarch64_load_tp_hard (target));
++    }
++  else
++    {
++      /* Always returned in r0.  Immediately copy the result into a pseudo,
++	 otherwise other uses of r0 (e.g. setting up function arguments) may
++	 clobber the value.  */
++
++      rtx tmp;
++
++      emit_insn (gen_aarch64_load_tp_soft ());
++
++      tmp = gen_rtx_REG (DImode, R0_REGNUM);
++      emit_move_insn (target, tmp);
++    }
+   return target;
+ }
+ 
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-elf-raw.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-elf-raw.h
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-elf-raw.h	2017-01-01 12:07:43.905435000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-elf-raw.h	2018-01-22 20:15:07.232099998 +0000
+@@ -22,6 +22,7 @@
+ #ifndef GCC_AARCH64_ELF_RAW_H
+ #define GCC_AARCH64_ELF_RAW_H
+ 
++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
+ #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
+ #define ENDFILE_SPEC \
+   " crtend%O%s crtn%O%s " \
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.h
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.h	2017-09-21 13:16:31.171118000 +0100
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.h	2018-01-22 20:15:07.232099998 +0000
+@@ -887,6 +887,10 @@
+ /* Check TLS Descriptors mechanism is selected.  */
+ #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
+ 
++/* Check selected thread pointer access sequence to use.  */
++#define TARGET_HARD_TP (target_thread_pointer == TP_HARD)
++#define TARGET_SOFT_TP (target_thread_pointer == TP_SOFT)
++
+ extern enum aarch64_code_model aarch64_cmodel;
+ 
+ /* When using the tiny addressing model conditional and unconditional branches
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.md gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.md
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.md	2017-04-05 12:48:02.927619000 +0100
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.md	2018-01-22 20:15:07.236099934 +0000
+@@ -5230,11 +5230,22 @@
+ (define_insn "aarch64_load_tp_hard"
+   [(set (match_operand:DI 0 "register_operand" "=r")
+ 	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
+-  ""
+-  "mrs\\t%0, tpidr_el0"
++  "TARGET_HARD_TP"
++  "mrs\\t%0, tpidr_el0\\t// aarch64_load_tp_hard"
+   [(set_attr "type" "mrs")]
+ )
+ 
++(define_insn "aarch64_load_tp_soft"
++  [(set (reg:DI 0) (unspec:DI [(const_int 0)] UNSPEC_TLS))
++   (clobber (reg:DI IP0_REGNUM))
++   (clobber (reg:DI IP1_REGNUM))
++   (clobber (reg:DI LR_REGNUM))
++   (clobber (reg:CC CC_REGNUM))]
++  "TARGET_SOFT_TP"
++  "bl\\t__aarch64_read_tp\\t// aarch64_load_tp_soft"
++  [(set_attr "type" "branch")]
++)
++
+ ;; The TLS ABI specifically requires that the compiler does not schedule
+ ;; instructions in the TLS stubs, in order to enable linker relaxation.
+ ;; Therefore we treat the stubs as an atomic sequence.
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.opt gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.opt
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.opt	2017-03-17 17:05:23.131899000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.opt	2018-01-22 20:15:07.236099934 +0000
+@@ -115,6 +115,20 @@
+ EnumValue
+ Enum(aarch64_tls_size) String(48) Value(48)
+ 
++mtp=
++Target RejectNegative Joined Enum(aarch64_tp_type) Var(target_thread_pointer) Init(TP_HARD)
++Specify how to access the thread pointer.
++
++Enum
++Name(aarch64_tp_type) Type(enum aarch64_tp_type)
++Valid arguments to -mtp=:
++
++EnumValue
++Enum(aarch64_tp_type) String(hard) Value(TP_HARD)
++
++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.
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-opts.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-opts.h
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-opts.h	2017-01-20 00:03:20.347898000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-opts.h	2018-01-22 20:15:07.232099998 +0000
+@@ -48,6 +48,12 @@
+   TLS_DESCRIPTORS
+ };
+ 
++/* Which thread pointer access sequence to use.  */
++enum aarch64_tp_type {
++  TP_HARD,
++  TP_SOFT
++};
++
+ /* The code model defines the address generation strategy.
+    Most have a PIC and non-PIC variant.  */
+ enum aarch64_code_model {
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/t-aarch64 gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/t-aarch64
+--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/t-aarch64	2017-01-01 12:07:43.905435000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/t-aarch64	2018-01-22 20:15:07.236099934 +0000
+@@ -68,5 +68,7 @@
+ 		$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
+ 
+ comma=,
+-MULTILIB_OPTIONS    = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
+-MULTILIB_DIRNAMES   = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
++MULTILIB_OPTIONS    = mcmodel=large fPIC
++MULTILIB_DIRNAMES   = large pic
++MULTILIB_REQUIRED   = mcmodel=large fPIC
++MULTILIB_MATCHES    = fPIC=fpic fPIC=fpie fPIC=fPIE
+diff -NBaur gcc-7.3.0-RC-20180122/gcc/gcc.c gcc-7.3.0-RC-20180122-aarch64/gcc/gcc.c
+--- gcc-7.3.0-RC-20180122/gcc/gcc.c	2017-09-15 09:18:34.015147000 +0100
++++ gcc-7.3.0-RC-20180122-aarch64/gcc/gcc.c	2018-01-22 20:15:07.236099934 +0000
+@@ -779,6 +779,11 @@
+ #endif
+ #endif
+ 
++#ifndef LIBGLOSS_SPEC
++# define LIBGLOSS_SPEC "-lsysbase"
++#endif
++
++
+ /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
+ #ifndef STARTFILE_SPEC
+ #define STARTFILE_SPEC  \
+@@ -1074,6 +1079,7 @@
+ static const char *lib_spec = LIB_SPEC;
+ static const char *link_gomp_spec = "";
+ static const char *libgcc_spec = LIBGCC_SPEC;
++static const char *libgloss_spec = LIBGLOSS_SPEC;
+ static const char *endfile_spec = ENDFILE_SPEC;
+ static const char *startfile_spec = STARTFILE_SPEC;
+ static const char *linker_name_spec = LINKER_NAME;
+@@ -1579,6 +1585,7 @@
+   INIT_STATIC_SPEC ("lib",			&lib_spec),
+   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
+   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
++  INIT_STATIC_SPEC ("libgloss",			&libgloss_spec),
+   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
+   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
+   INIT_STATIC_SPEC ("version",			&compiler_version),
+diff -NBaur gcc-7.3.0-RC-20180122/libgcc/crtstuff.c gcc-7.3.0-RC-20180122-aarch64/libgcc/crtstuff.c
+--- gcc-7.3.0-RC-20180122/libgcc/crtstuff.c	2017-01-01 12:07:43.905435000 +0000
++++ gcc-7.3.0-RC-20180122-aarch64/libgcc/crtstuff.c	2018-01-22 20:15:07.236099934 +0000
+@@ -47,6 +47,7 @@
+ 
+ /* Target machine header files require this define. */
+ #define IN_LIBGCC2
++#define USED_FOR_TARGET
+ 
+ /* FIXME: Including auto-host is incorrect, but until we have
+    identified the set of defines that need to go into auto-target.h,
+diff -NBaur gcc-7.3.0-RC-20180122/libgcc/Makefile.in gcc-7.3.0-RC-20180122-aarch64/libgcc/Makefile.in
+--- gcc-7.3.0-RC-20180122/libgcc/Makefile.in	2017-04-19 09:08:44.446150000 +0100
++++ gcc-7.3.0-RC-20180122-aarch64/libgcc/Makefile.in	2018-01-22 20:15:07.236099934 +0000
+@@ -844,7 +844,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)
+ 

dka64/rules/base_rules

@@ -0,0 +1,40 @@
+include $(DEVKITPRO)/devkitA64/base_tools
+
+#---------------------------------------------------------------------------------
+%.a:
+#---------------------------------------------------------------------------------
+	@echo $(notdir $@)
+	@rm -f $@
+	$(AR) -rc $@ $^
+
+
+#---------------------------------------------------------------------------------
+%.o: %.cpp
+	@echo $(notdir $<)
+	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ $(ERROR_FILTER)
+
+#---------------------------------------------------------------------------------
+%.o: %.c
+	@echo $(notdir $<)
+	$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) -c $< -o $@ $(ERROR_FILTER)
+
+#---------------------------------------------------------------------------------
+%.o: %.s
+	@echo $(notdir $<)
+	$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
+
+#---------------------------------------------------------------------------------
+%.o: %.S
+	@echo $(notdir $<)
+	$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
+
+#---------------------------------------------------------------------------------
+# canned command sequence for binary data
+#---------------------------------------------------------------------------------
+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/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+endef
+

dka64/rules/base_tools

@@ -0,0 +1,38 @@
+#---------------------------------------------------------------------------------
+# make sure we have bash on OSX
+#---------------------------------------------------------------------------------
+UNAME_S	:=	$(shell uname -s)
+UNAME_R	:=	$(shell uname -r)
+
+ifneq (,$(findstring Darwin,$(UNAME_S)))
+	export SHELL=/bin/bash
+endif
+#---------------------------------------------------------------------------------
+# path to tools
+#---------------------------------------------------------------------------------
+export PATH	:=	$(DEVKITPRO)/devkitA64/bin:$(PATH)
+
+#---------------------------------------------------------------------------------
+# add portlibs path
+#---------------------------------------------------------------------------------
+export PORTLIBS_PATH	:=	$(DEVKITPRO)/portlibs
+
+#---------------------------------------------------------------------------------
+# the prefix on the compiler executables
+#---------------------------------------------------------------------------------
+PREFIX		:=	aarch64-none-elf-
+
+export CC	:=	$(PREFIX)gcc
+export CXX	:=	$(PREFIX)g++
+export AS	:=	$(PREFIX)as
+export AR	:=	$(PREFIX)gcc-ar
+export OBJCOPY	:=	$(PREFIX)objcopy
+export STRIP	:=	$(PREFIX)strip
+export NM	:=	$(PREFIX)gcc-nm
+export RANLIB	:=	$(PREFIX)gcc-ranlib
+
+ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
+
+ifneq (,$(ISVC))
+	ERROR_FILTER	:=	2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
+endif

dka64/scripts/build-gcc.sh

@@ -0,0 +1,178 @@
+#!/bin/sh
+#---------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------
+# build and install binutils
+#---------------------------------------------------------------------------------
+
+mkdir -p $target/binutils
+cd $target/binutils
+
+if [ ! -f configured-binutils ]
+then
+	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+        --prefix=$prefix --target=$target --disable-nls --disable-werror \
+	--enable-lto --enable-plugins --enable-poison-system-directories \
+	$CROSS_PARAMS \
+        || { echo "Error configuring binutils"; exit 1; }
+	touch configured-binutils
+fi
+
+if [ ! -f built-binutils ]
+then
+  $MAKE || { echo "Error building binutils"; exit 1; }
+  touch built-binutils
+fi
+
+if [ ! -f installed-binutils ]
+then
+  $MAKE install || { echo "Error installing binutils"; exit 1; }
+  touch installed-binutils
+fi
+cd $BUILDDIR
+
+#---------------------------------------------------------------------------------
+# build and install just the c compiler
+#---------------------------------------------------------------------------------
+mkdir -p $target/gcc
+cd $target/gcc
+
+if [ ! -f configured-gcc ]
+then
+	CFLAGS="$cflags" \
+	CXXFLAGS="$cflags" \
+	LDFLAGS="$ldflags" \
+	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
+	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
+	LDFLAGS_FOR_TARGET="" \
+	../../gcc-$GCC_VER/configure \
+		--enable-languages=c,c++ \
+		--with-gnu-as --with-gnu-ld --with-gcc \
+		--with-march=armv8\
+		--enable-cxx-flags='-ffunction-sections' \
+		--disable-libstdcxx-verbose \
+		--enable-poison-system-directories \
+		--enable-interwork --enable-multilib \
+		--enable-threads --disable-win32-registry --disable-nls --disable-debug\
+		--disable-libmudflap --disable-libssp --disable-libgomp \
+		--disable-libstdcxx-pch \
+		--target=$target \
+		--with-newlib \
+		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
+		--prefix=$prefix \
+		--enable-lto $plugin_ld\
+		--with-system-zlib \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 alpha 7" \
+		$CROSS_PARAMS \
+		|| { echo "Error configuring gcc"; exit 1; }
+	touch configured-gcc
+fi
+
+if [ ! -f built-gcc ]
+then
+	$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
+	touch built-gcc
+fi
+
+if [ ! -f installed-gcc ]
+then
+	$MAKE install-gcc || { echo "Error installing gcc"; exit 1; }
+	touch installed-gcc
+fi
+
+
+unset CFLAGS
+cd $BUILDDIR
+
+#---------------------------------------------------------------------------------
+# build and install newlib
+#---------------------------------------------------------------------------------
+mkdir -p $target/newlib
+cd $target/newlib
+
+if [ ! -f configured-newlib ]
+then
+	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
+	../../newlib-$NEWLIB_VER/configure \
+	--disable-newlib-supplied-syscalls \
+	--enable-newlib-mb \
+	--disable-newlib-wide-orient \
+	--target=$target \
+	--prefix=$prefix \
+	|| { echo "Error configuring newlib"; exit 1; }
+	touch configured-newlib
+fi
+
+if [ ! -f built-newlib ]
+then
+	$MAKE || { echo "Error building newlib"; exit 1; }
+	touch built-newlib
+fi
+
+
+if [ ! -f installed-newlib ]
+then
+	$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
+	touch installed-newlib
+fi
+
+#---------------------------------------------------------------------------------
+# build and install the final compiler
+#---------------------------------------------------------------------------------
+
+cd $BUILDDIR
+
+cd $target/gcc
+
+if [ ! -f built-stage2 ]
+then
+	$MAKE all || { echo "Error building gcc stage2"; exit 1; }
+	touch built-stage2
+fi
+
+if [ ! -f installed-stage2 ]
+then
+	$MAKE install || { echo "Error installing gcc stage2"; exit 1; }
+	touch installed-stage2
+fi
+
+rm -fr $prefix/$target/sys-include
+
+cd $BUILDDIR
+
+#---------------------------------------------------------------------------------
+# build and install the debugger
+#---------------------------------------------------------------------------------
+mkdir -p $target/gdb
+cd $target/gdb
+
+PLATFORM=`uname -s`
+
+if [ ! -f configured-gdb ]
+then
+	CFLAGS="$cflags" \
+	CXXFLAGS="$cflags" \
+	LDFLAGS="$ldflags" \
+	../../gdb-$GDB_VER/configure \
+	--disable-nls --prefix=$prefix --target=$target --disable-werror \
+	$CROSS_PARAMS \
+	|| { echo "Error configuring gdb"; exit 1; }
+	touch configured-gdb
+fi
+
+if [ ! -f built-gdb ]
+then
+	$MAKE || { echo "Error building gdb"; exit 1; }
+	touch built-gdb
+fi
+
+if [ ! -f installed-gdb ]
+then
+	$MAKE install || { echo "Error installing gdb"; exit 1; }
+	touch installed-gdb
+fi
+
+#---------------------------------------------------------------------------------
+# copy base rulesets
+#---------------------------------------------------------------------------------
+cp -v $BUILDSCRIPTDIR/dka64/rules/* $prefix

dka64/scripts/build-tools.sh

@@ -0,0 +1,20 @@
+#!/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=$prefix $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/crtls/3dsx.ld

@@ -40,7 +40,9 @@ SECTIONS
 
 	/* =========== RODATA section =========== */
 
-	.rodata ALIGN(0x1000) :
+	. = ALIGN(0x1000);
+
+	.rodata :
 	{
 		*(.rodata)
 		*(.roda)
@@ -58,7 +60,9 @@ SECTIONS
 
 	/* =========== DATA section =========== */
 
-	.data ALIGN(0x1000) :
+	. = ALIGN(0x1000);
+
+	.data :
 	{
 		*(.data)
 		*(.data.*)

dkarm-eabi/patches/gcc-7.1.0.patch

@@ -1,6 +1,6 @@
-diff -NBaur gcc-6.2.0/gcc/config/arm/t-arm-elf gcc-6.2.0-arm/gcc/config/arm/t-arm-elf
+diff -NBaur gcc-7.1.0/gcc/config/arm/t-arm-elf gcc-7.1.0-arm/gcc/config/arm/t-arm-elf
---- gcc-6.2.0/gcc/config/arm/t-arm-elf	2016-01-04 14:30:50.000000000 +0000
+--- gcc-7.1.0/gcc/config/arm/t-arm-elf	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-6.2.0-arm/gcc/config/arm/t-arm-elf	2016-12-10 12:16:20.076000000 +0000
++++ gcc-7.1.0-arm/gcc/config/arm/t-arm-elf	2017-05-03 12:58:45.387209969 +0100
 @@ -16,11 +16,19 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
@@ -36,9 +36,9 @@ diff -NBaur gcc-6.2.0/gcc/config/arm/t-arm-elf gcc-6.2.0-arm/gcc/config/arm/t-ar
  #MULTILIB_EXCEPTIONS    += *mcpu=fa526/*mfloat-abi=hard*
  #MULTILIB_EXCEPTIONS    += *mcpu=fa626/*mfloat-abi=hard*
  
-diff -NBaur gcc-6.2.0/gcc/config/arm/unknown-elf.h gcc-6.2.0-arm/gcc/config/arm/unknown-elf.h
+diff -NBaur gcc-7.1.0/gcc/config/arm/unknown-elf.h gcc-7.1.0-arm/gcc/config/arm/unknown-elf.h
---- gcc-6.2.0/gcc/config/arm/unknown-elf.h	2016-01-04 14:30:50.000000000 +0000
+--- gcc-7.1.0/gcc/config/arm/unknown-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-6.2.0-arm/gcc/config/arm/unknown-elf.h	2016-09-07 08:58:29.977682360 +0100
++++ gcc-7.1.0-arm/gcc/config/arm/unknown-elf.h	2017-06-08 12:22:17.868509897 +0100
 @@ -29,7 +29,7 @@
  #endif
  
@@ -48,16 +48,21 @@ diff -NBaur gcc-6.2.0/gcc/config/arm/unknown-elf.h gcc-6.2.0-arm/gcc/config/arm/
  
  #undef  STARTFILE_SPEC
  #define STARTFILE_SPEC	\
-@@ -97,4 +97,4 @@
+@@ -93,4 +93,9 @@
     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 %L %(libgloss) --end-group"
-diff -NBaur gcc-6.2.0/gcc/gcc.c gcc-6.2.0-arm/gcc/gcc.c
++
---- gcc-6.2.0/gcc/gcc.c	2016-08-15 12:19:34.000000000 +0100
++/* The system headers under devkitARM are C++-aware.  */
-+++ gcc-6.2.0-arm/gcc/gcc.c	2016-09-07 08:58:29.981682360 +0100
++#undef NO_IMPLICIT_EXTERN_C
-@@ -778,6 +778,11 @@
++#define NO_IMPLICIT_EXTERN_C
++
+diff -NBaur gcc-7.1.0/gcc/gcc.c gcc-7.1.0-arm/gcc/gcc.c
+--- gcc-7.1.0/gcc/gcc.c	2017-01-17 09:38:48.000000000 +0000
++++ gcc-7.1.0-arm/gcc/gcc.c	2017-05-03 12:58:45.395210596 +0100
+@@ -779,6 +779,11 @@
  #endif
  #endif
  
@@ -69,7 +74,7 @@ diff -NBaur gcc-6.2.0/gcc/gcc.c gcc-6.2.0-arm/gcc/gcc.c
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1062,6 +1067,7 @@
+@@ -1074,6 +1079,7 @@
  static const char *lib_spec = LIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -77,7 +82,7 @@ diff -NBaur gcc-6.2.0/gcc/gcc.c gcc-6.2.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;
-@@ -1563,6 +1569,7 @@
+@@ -1579,6 +1585,7 @@
    INIT_STATIC_SPEC ("lib",			&lib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -85,18 +90,18 @@ diff -NBaur gcc-6.2.0/gcc/gcc.c gcc-6.2.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-6.2.0/libgcc/config/arm/t-bpabi gcc-6.2.0-arm/libgcc/config/arm/t-bpabi
+diff -NBaur gcc-7.1.0/libgcc/config/arm/t-bpabi gcc-7.1.0-arm/libgcc/config/arm/t-bpabi
---- gcc-6.2.0/libgcc/config/arm/t-bpabi	2012-08-17 16:06:06.000000000 +0100
+--- gcc-7.1.0/libgcc/config/arm/t-bpabi	2012-08-17 16:06:06.000000000 +0100
-+++ gcc-6.2.0-arm/libgcc/config/arm/t-bpabi	2016-09-07 08:58:29.985682360 +0100
++++ gcc-7.1.0-arm/libgcc/config/arm/t-bpabi	2017-05-03 12:58:45.395210596 +0100
 @@ -17,4 +17,4 @@
  # 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-6.2.0/libgcc/crtstuff.c gcc-6.2.0-arm/libgcc/crtstuff.c
+diff -NBaur gcc-7.1.0/libgcc/crtstuff.c gcc-7.1.0-arm/libgcc/crtstuff.c
---- gcc-6.2.0/libgcc/crtstuff.c	2016-01-04 14:30:50.000000000 +0000
+--- gcc-7.1.0/libgcc/crtstuff.c	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-6.2.0-arm/libgcc/crtstuff.c	2016-09-07 08:58:29.985682360 +0100
++++ gcc-7.1.0-arm/libgcc/crtstuff.c	2017-05-03 12:58:45.395210596 +0100
 @@ -47,7 +47,7 @@
  
  /* Target machine header files require this define. */
@@ -106,10 +111,10 @@ diff -NBaur gcc-6.2.0/libgcc/crtstuff.c gcc-6.2.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-6.2.0/libgcc/Makefile.in gcc-6.2.0-arm/libgcc/Makefile.in
+diff -NBaur gcc-7.1.0/libgcc/Makefile.in gcc-7.1.0-arm/libgcc/Makefile.in
---- gcc-6.2.0/libgcc/Makefile.in	2016-02-25 12:23:52.000000000 +0000
+--- gcc-7.1.0/libgcc/Makefile.in	2017-04-19 09:08:44.000000000 +0100
-+++ gcc-6.2.0-arm/libgcc/Makefile.in	2016-09-07 08:58:29.989682360 +0100
++++ gcc-7.1.0-arm/libgcc/Makefile.in	2017-05-03 12:58:45.399210922 +0100
-@@ -820,7 +820,7 @@
+@@ -844,7 +844,7 @@
  # libgcc_eh.a, only LIB2ADDEH matters.  If we do, only LIB2ADDEHSTATIC and
  # LIB2ADDEHSHARED matter.  (Usually all three are identical.)
  

dkarm-eabi/patches/gdb-7.11.patch

@@ -1,32 +0,0 @@
-diff -NBaur gdb-7.11/gdb/Makefile.in gdb-7.11-arm/gdb/Makefile.in
---- gdb-7.11/gdb/Makefile.in	2016-02-24 09:55:15.000000000 +0000
-+++ gdb-7.11-arm/gdb/Makefile.in	2016-05-13 15:06:03.629019640 +0100
-@@ -2726,10 +2726,8 @@
- # Note that we put the dependencies into a .Tpo file, then move them
- # into place if the compile succeeds.  We need this because gcc does
- # not atomically write the dependency output file.
--@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
--@GMAKE_TRUE@	-MF $(DEPDIR)/$(basename $(@F)).Tpo
--@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
--@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
-+@GMAKE_TRUE@override COMPILE.post = -c -o $@
-+@GMAKE_TRUE@override POSTCOMPILE =
- @GMAKE_TRUE@else
- @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
- @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
-diff -NBaur gdb-7.11/sim/common/Make-common.in gdb-7.11-arm/sim/common/Make-common.in
---- gdb-7.11/sim/common/Make-common.in	2016-02-10 03:19:39.000000000 +0000
-+++ gdb-7.11-arm/sim/common/Make-common.in	2016-05-13 15:06:03.633019640 +0100
-@@ -402,10 +402,8 @@
- # Note that we put the dependencies into a .Tpo file, then move them
- # into place if the compile succeeds.  We need this because gcc does
- # not atomically write the dependency output file.
--@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
--@GMAKE_TRUE@	-MF $(DEPDIR)/$(basename $(@F)).Tpo
--@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
--@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
-+@GMAKE_TRUE@override COMPILE.post = -c -o $@
-+@GMAKE_TRUE@override POSTCOMPILE =
- @GMAKE_TRUE@else
- @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
- @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)

dkarm-eabi/patches/gdb-8.0.patch

@@ -0,0 +1,441 @@
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
+index 1d2dbaf3f7..2d24f09c1b 100644
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
+@@ -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: */
++
++/*
++   Copyright (C) 2002-2017 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include "defs.h"
++#include "gdbcore.h"
++#include "target.h"
++#include "osabi.h"
++#include "xml-syscall.h"
++
++#include "arch/arm.h"
++#include "arch/arm-get-next-pcs.h"
++#include "arm-tdep.h"
++
++static const gdb_byte arm_3ds_arm_le_breakpoint[] = {0xff, 0x00, 0x00, 0xef};
++static const gdb_byte arm_3ds_thumb_le_breakpoint[] = {0xff, 0xdf};
++
++static CORE_ADDR
++  arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
++
++/* Operation function pointers for get_next_pcs.  */
++static struct arm_get_next_pcs_ops arm_3ds_get_next_pcs_ops = {
++  arm_get_next_pcs_read_memory_unsigned_integer,
++  arm_3ds_get_next_pcs_syscall_next_pc,
++  arm_get_next_pcs_addr_bits_remove,
++  arm_get_next_pcs_is_thumb,
++  NULL,
++};
++
++static CORE_ADDR
++arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
++{
++  CORE_ADDR next_pc = 0;
++  CORE_ADDR pc = regcache_read_pc (self->regcache);
++  int is_thumb = arm_is_thumb (self->regcache);
++  ULONGEST svc_number = 0;
++
++  if (is_thumb)
++    {
++      next_pc = pc + 2;
++    }
++  else
++    {
++      next_pc = pc + 4;
++    }
++
++  /* Addresses for calling Thumb functions have the bit 0 set.  */
++  if (is_thumb)
++    next_pc = MAKE_THUMB_ADDR (next_pc);
++
++  return next_pc;
++}
++
++static 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)
++{
++  struct regcache *regs = get_thread_regcache (ptid);
++
++  ULONGEST pc;
++  ULONGEST cpsr;
++  ULONGEST t_bit = arm_psr_thumb_bit (gdbarch);
++  int is_thumb;
++  ULONGEST svc_number = -1;
++
++  regcache_cooked_read_unsigned (regs, ARM_PC_REGNUM, &pc);
++  regcache_cooked_read_unsigned (regs, ARM_PS_REGNUM, &cpsr);
++  is_thumb = (cpsr & t_bit) != 0;
++
++  if (is_thumb)
++    {
++      enum bfd_endian byte_order_for_code =
++	gdbarch_byte_order_for_code (gdbarch);
++
++      /* PC gets incremented before the syscall-stop, so read the
++	 previous instruction.  */
++      unsigned long this_instr =
++	read_memory_unsigned_integer (pc - 2, 2, byte_order_for_code);
++
++      unsigned long svc_operand = (0x00ff & this_instr);
++      svc_number = svc_operand;
++    }
++  else
++    {
++      enum bfd_endian byte_order_for_code =
++	gdbarch_byte_order_for_code (gdbarch);
++
++      /* PC gets incremented before the syscall-stop, so read the
++	 previous instruction.  */
++      unsigned long this_instr =
++	read_memory_unsigned_integer (pc - 4, 4, byte_order_for_code);
++
++      unsigned long svc_operand = (0x000000ff & this_instr);
++      svc_number = svc_operand;
++    }
++
++  if (svc_number == 0xfe)
++    {
++      regcache_cooked_read_unsigned (regs, 12, &svc_number);
++    }
++
++  return svc_number;
++}
++
++static void
++arm_3ds_init_abi (struct gdbarch_info info,
++			    struct gdbarch *gdbarch)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
++
++  switch (info.byte_order)
++    {
++    case BFD_ENDIAN_LITTLE:
++      tdep->arm_breakpoint = arm_3ds_arm_le_breakpoint;
++      tdep->thumb_breakpoint = arm_3ds_thumb_le_breakpoint;
++      tdep->arm_breakpoint_size = sizeof (arm_3ds_arm_le_breakpoint);
++      tdep->thumb_breakpoint_size = sizeof (arm_3ds_thumb_le_breakpoint);
++      break;
++
++    default:
++      internal_error (__FILE__, __LINE__,
++        _("arm_gdbarch_init: bad byte order"));
++    }
++  tdep->fp_model = ARM_FLOAT_VFP;
++
++  /* Single stepping.  */
++  set_gdbarch_software_single_step (gdbarch, arm_3ds_software_single_step);
++
++  /* `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
+index fdcb7b1d69..d8fd1622b8 100644
+--- a/gdb/configure.tgt
++++ b/gdb/configure.tgt
+@@ -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
+index 304d4b05c0..2cf8986d3a 100644
+--- a/gdb/data-directory/Makefile.in
++++ b/gdb/data-directory/Makefile.in
+@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
+ 	sparc-linux.xml \
+ 	sparc64-linux.xml
+ 
+-SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
++SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml arm-3ds.xml $(GEN_SYSCALLS_FILES)
+ 
+ PYTHON_DIR = python
+ PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
+diff --git a/gdb/defs.h b/gdb/defs.h
+index a0b586f401..a1508fd5b3 100644
+--- a/gdb/defs.h
++++ b/gdb/defs.h
+@@ -604,6 +604,7 @@ enum gdb_osabi
+   GDB_OSABI_LYNXOS178,
+   GDB_OSABI_NEWLIB,
+   GDB_OSABI_SDE,
++  GDB_OSABI_3DS,
+ 
+   GDB_OSABI_INVALID		/* keep this last */
+ };
+diff --git a/gdb/osabi.c b/gdb/osabi.c
+index 84fa9c0273..c1c4bb1672 100644
+--- a/gdb/osabi.c
++++ b/gdb/osabi.c
+@@ -79,6 +79,7 @@ static const struct osabi_names gdb_osabi_names[] =
+   { "LynxOS178", NULL },
+   { "Newlib", NULL },
+   { "SDE", NULL },
++  { "3DS", NULL },
+ 
+   { "<invalid>", NULL }
+ };
+diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
+new file mode 100644
+index 0000000000..48780b7bd5
+--- /dev/null
++++ b/gdb/syscalls/arm-3ds.xml
+@@ -0,0 +1,159 @@
++<?xml version="1.0"?>
++<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
++<!-- This file is located inside GDB and is based on files which license are: -->
++<!-- Copyright (C) 2009-2017 Free Software Foundation, Inc.
++
++     Copying and distribution of this file, with or without modification,
++     are permitted in any medium without royalty provided the copyright
++     notice and this notice are preserved.  This file is offered as-is,
++     without any warranty. -->
++<syscalls_info>
++  <syscall name="ControlMemory" number="1" groups="memory"/>
++  <syscall name="QueryMemory" number="2" groups="memory"/>
++
++  <syscall name="ExitProcess" number="3" groups="process"/>
++  <syscall name="GetProcessAffinityMask" number="4" groups="process"/>
++  <syscall name="SetProcessAffinityMask" number="5" groups="process"/>
++  <syscall name="GetProcessIdealProcessor" number="6" groups="process"/>
++  <syscall name="SetProcessIdealProcessor" number="7" groups="process"/>
++
++  <syscall name="CreateThread" number="8" groups="thread"/>
++  <syscall name="ExitThread" number="9" groups="thread"/>
++  <syscall name="SleepThread" number="10" groups="thread"/>
++  <syscall name="GetThreadPriority" number="11" groups="thread"/>
++  <syscall name="SetThreadPriority" number="12" groups="thread"/>
++  <syscall name="GetThreadAffinityMask" number="13" groups="thread"/>
++  <syscall name="SetThreadAffinityMask" number="14" groups="thread"/> <!-- removed -->
++  <syscall name="GetThreadIdealProcessor" number="15" groups="thread"/>
++  <syscall name="SetThreadIdealProcessor" number="16" groups="thread"/> <!-- removed -->
++  <syscall name="GetCurrentProcessorNumber" number="17" groups="thread"/>
++  <syscall name="Run" number="18" groups="thread"/>
++
++  <syscall name="CreateMutex" number="19" groups="synchronization"/>
++  <syscall name="ReleaseMutex" number="20" groups="synchronization"/>
++  <syscall name="CreateSemaphore" number="21" groups="synchronization"/>
++  <syscall name="ReleaseSemaphore" number="22" groups="synchronization"/>
++  <syscall name="CreateEvent" number="23" groups="synchronization"/>
++  <syscall name="SignalEvent" number="24" groups="synchronization"/>
++  <syscall name="ClearEvent" number="25" groups="synchronization"/>
++  <syscall name="CreateTimer" number="26" groups="synchronization"/>
++  <syscall name="SetTimer" number="27" groups="synchronization"/>
++  <syscall name="CancelTimer" number="28" groups="synchronization"/>
++  <syscall name="ClearTimer" number="29" groups="synchronization"/>
++
++  <syscall name="CreateMemoryBlock" number="30" groups="memory,ipc"/>
++  <syscall name="MapMemoryBlock" number="31" groups="memory,ipc"/>
++  <syscall name="UnmapMemoryBlock" number="32" groups="memory,ipc"/>
++
++  <syscall name="CreateAddressArbiter" number="33" groups="memory,synchronization"/>
++  <syscall name="ArbitrateAddress" number="34" groups="memory,synchronization"/>
++
++  <syscall name="CloseHandle" number="35" groups="synchronization,ipc,memory,thread,process,debug"/>
++  <syscall name="WaitSynchronization" number="36" groups="synchronization,ipc,thread,process,debug"/>
++  <syscall name="WaitSynchronizationN" number="37" groups="synchronization,ipc,thread,process,debug"/>
++  <syscall name="SignalAndWait" number="38" groups="synchronization"/> <!-- removed -->
++  <syscall name="DuplicateHandle" number="39" groups="synchronization,ipc,memory,thread,process,debug"/>
++
++  <syscall name="GetSystemTick" number="40" groups="information"/>
++  <syscall name="GetHandleInfo" number="41" groups="information,synchronization,ipc,memory,thread,process,debug"/>
++  <syscall name="GetSystemInfo" number="42" groups="information"/>
++  <syscall name="GetProcessInfo" number="43" groups="information,process"/>
++  <syscall name="GetThreadInfo" number="44" groups="information,thread"/>
++
++  <syscall name="ConnectToPort" number="45" groups="ipc"/>
++  <syscall name="GetCFWInfo" number="46" groups="custom,information"/> <!-- deprecated -->
++  <syscall name="SendSyncRequest2" number="47" groups="ipc"/> <!-- removed -->
++  <syscall name="SendSyncRequest3" number="48" groups="ipc"/> <!-- removed -->
++  <syscall name="SendSyncRequest4" number="49" groups="ipc"/> <!-- removed -->
++  <syscall name="SendSyncRequest" number="50" groups="ipc"/> <!-- removed -->
++
++  <syscall name="OpenProcess" number="51" groups="process"/>
++  <syscall name="OpenThread" number="52" groups="thread"/>
++
++  <syscall name="GetProcessId" number="53" groups="process"/>
++  <syscall name="GetProcessIdOfThread" number="54" groups="process,thread"/>
++  <syscall name="GetThreadId" number="55" groups="thread"/>
++
++  <syscall name="GetResourceLimit" number="56" groups="process"/>
++  <syscall name="GetResourceLimitLimitValues" number="57" groups="process"/>
++  <syscall name="GetResourceLimitCurrentValues" number="58" groups="process"/>
++
++  <syscall name="GetThreadContext" number="59" groups="debug,thread"/> <!-- removed -->
++  <syscall name="Break" number="60" groups="debug"/>
++  <syscall name="OutputDebugString" number="61" groups="debug"/>
++  <syscall name="ControlPerformanceCounter" number="62" groups="debug"/>
++
++  <syscall name="CreatePort" number="71" groups="ipc"/>
++  <syscall name="CreateSessionToPort" number="72" groups="ipc"/>
++  <syscall name="CreateSession" number="73" groups="ipc"/>
++  <syscall name="AcceptSession" number="74" groups="ipc"/>
++  <syscall name="ReplyAndReceive1" number="75" groups="ipc"/>
++  <syscall name="ReplyAndReceive2" number="76" groups="ipc"/>
++  <syscall name="ReplyAndReceive3" number="77" groups="ipc"/>
++  <syscall name="ReplyAndReceive4" number="78" groups="ipc"/>
++  <syscall name="ReplyAndReceive" number="79" groups="ipc"/>
++
++  <syscall name="BindInterrupt" number="80" groups="io,synchronization"/>
++  <syscall name="UnbindInterrupt" number="81" groups="io,synchronization"/>
++  <syscall name="InvalidateProcessDataCache" number="82" groups="io,memory,process"/>
++  <syscall name="StoreProcessDataCache" number="83" groups="io,memory,process"/>
++  <syscall name="FlushProcessDataCache" number="84" groups="io,memory,process"/>
++
++  <syscall name="StartInterprocessDma" number="85" groups="io,memory,ipc"/>
++  <syscall name="StopDma" number="86" groups="io,memory,ipc"/>
++  <syscall name="GetDmaState" number="87" groups="io,memory,ipc"/>
++  <syscall name="RestartDma" number="88" groups="io,memory,ipc"/>
++
++  <syscall name="SetGpuProt" number="89" groups="io"/>
++  <syscall name="SetWifiEnabled" number="90" groups="io"/>
++
++  <syscall name="DebugActiveProcess" number="96" groups="debug,process"/>
++  <syscall name="BreakDebugProcess" number="97" groups="debug,process"/>
++  <syscall name="TerminateDebugProcess" number="98" groups="debug,process"/>
++  <syscall name="GetProcessDebugEvent" number="99" groups="debug"/>
++  <syscall name="ContinueDebugEvent" number="100" groups="debug"/>
++  <syscall name="GetProcessList" number="101" groups="information,debug,process"/>
++  <syscall name="GetThreadList" number="102" groups="information,debug,thread"/>
++  <syscall name="GetDebugThreadContext" number="103" groups="debug,thread"/>
++  <syscall name="SetDebugThreadContext" number="104" groups="debug,thread"/>
++  <syscall name="QueryDebugProcessMemory" number="105" groups="debug,process,memory"/>
++  <syscall name="ReadProcessMemory" number="106" groups="debug,process,memory"/>
++  <syscall name="WriteProcessMemory" number="107" groups="debug,process,memory"/>
++  <syscall name="SetHardwareBreakPoint" number="108" group="debug"/>
++  <syscall name="GetDebugThreadParam" number="109" group="debug,thread"/>
++
++  <syscall name="ControlProcessMemory" number="112" group="process,memory"/>
++  <syscall name="MapProcessMemory" number="113" group="process,memory"/>
++  <syscall name="UnmapProcessMemory" number="114" group="process,memory"/>
++
++  <syscall name="CreateCodeSet" number="115" group="process,memory"/>
++  <syscall name="RandomStub" number="116" group="process,memory"/> <!-- removed -->
++  <syscall name="CreateProcess" number="117" group="process"/>
++  <syscall name="TerminateProcess" number="118" group="process"/>
++  <syscall name="SetProcessResourceLimits" number="119" group="process"/>
++  <syscall name="CreateResourceLimit" number="120" group="process"/>
++  <syscall name="SetResourceLimitValues" number="121" group="process"/>
++  <syscall name="AddCodeSegment" number="122" group="process"/> <!-- removed -->
++
++  <syscall name="Backdoor" number="123" group="kernel"/>
++  <syscall name="KernelSetState" number="124" group="kernel"/>
++
++  <syscall name="QueryProcessMemory" number="125" group="process,memory"/>
++
++  <syscall name="CustomBackdoor" number="128" group="custom,kernel"/>
++
++  <syscall name="ConvertVAToPA" number="144" group="custom,io,memory"/>
++  <syscall name="FlushDataCacheRange" number="145" group="custom,io,memory"/>
++  <syscall name="FlushEntireDataCache" number="146" group="custom,io,memory"/>
++  <syscall name="InvalidateInstructionCacheRange" number="147" group="custom,io,memory"/>
++  <syscall name="InvalidateEntireInstructionCache" number="148" group="custom,io,memory"/>
++
++  <syscall name="MapProcessMemoryEx" number="160" group="custom,process,memory"/>
++  <syscall name="UnmapProcessMemoryEx" number="161" group="custom,process,memory"/>
++  <syscall name="ControlMemoryEx" number="162" group="custom,memory"/>
++
++  <syscall name="ControlService" number="176" group="custom,ipc"/>
++  <syscall name="CopyHandle" number="177" groups="custom,synchronization,ipc,thread,process,debug"/>
++  <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
++
++</syscalls_info>
+

dkarm-eabi/patches/newlib-2.5.0.patch

@@ -611,7 +611,7 @@ index 0000000..b6cdfae
 +m4_include([../acinclude.m4])
 diff --git a/libgloss/libsysbase/build_argv.c b/libgloss/libsysbase/build_argv.c
 new file mode 100644
-index 0000000..79d2006
+index 0000000..3ca95d5
 --- /dev/null
 +++ b/libgloss/libsysbase/build_argv.c
 @@ -0,0 +1,31 @@
@@ -648,7 +648,7 @@ index 0000000..79d2006
 +}
 diff --git a/libgloss/libsysbase/chdir.c b/libgloss/libsysbase/chdir.c
 new file mode 100644
-index 0000000..2a0fa03
+index 0000000..90d2dc5
 --- /dev/null
 +++ b/libgloss/libsysbase/chdir.c
 @@ -0,0 +1,201 @@
@@ -855,7 +855,7 @@ index 0000000..2a0fa03
 +}
 diff --git a/libgloss/libsysbase/chmod.c b/libgloss/libsysbase/chmod.c
 new file mode 100644
-index 0000000..ce79a2c
+index 0000000..3668b58
 --- /dev/null
 +++ b/libgloss/libsysbase/chmod.c
 @@ -0,0 +1,30 @@
@@ -891,7 +891,7 @@ index 0000000..ce79a2c
 +
 diff --git a/libgloss/libsysbase/close.c b/libgloss/libsysbase/close.c
 new file mode 100644
-index 0000000..d3563fb
+index 0000000..a251e5b
 --- /dev/null
 +++ b/libgloss/libsysbase/close.c
 @@ -0,0 +1,49 @@
@@ -976,7 +976,7 @@ index 0000000..48ce950
 +/* symbol prefix */
 +#undef __SYMBOL_PREFIX
 diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
-new file mode 100755
+new file mode 100644
 index 0000000..c4b5a79
 --- /dev/null
 +++ b/libgloss/libsysbase/configure
@@ -5141,7 +5141,7 @@ index 0000000..c4b5a79
 +
 diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
 new file mode 100644
-index 0000000..4c31956
+index 0000000..bf276a4
 --- /dev/null
 +++ b/libgloss/libsysbase/configure.in
 @@ -0,0 +1,199 @@
@@ -5721,7 +5721,7 @@ index 0000000..c6b8c92
 +}
 diff --git a/libgloss/libsysbase/fork.c b/libgloss/libsysbase/fork.c
 new file mode 100644
-index 0000000..712b13e
+index 0000000..3aa75a3
 --- /dev/null
 +++ b/libgloss/libsysbase/fork.c
 @@ -0,0 +1,25 @@
@@ -6469,7 +6469,7 @@ index 0000000..4565909
 +char *fake_heap_start = (char*)0;
 diff --git a/libgloss/libsysbase/mkdir.c b/libgloss/libsysbase/mkdir.c
 new file mode 100644
-index 0000000..4175cf8
+index 0000000..b4fcbd3
 --- /dev/null
 +++ b/libgloss/libsysbase/mkdir.c
 @@ -0,0 +1,19 @@
@@ -6612,7 +6612,7 @@ index 0000000..7f3f7f2
 +
 diff --git a/libgloss/libsysbase/rename.c b/libgloss/libsysbase/rename.c
 new file mode 100644
-index 0000000..7520d1d
+index 0000000..f8a0aa9
 --- /dev/null
 +++ b/libgloss/libsysbase/rename.c
 @@ -0,0 +1,41 @@
@@ -6806,7 +6806,7 @@ index 0000000..e474c47
 +
 diff --git a/libgloss/libsysbase/statvfs.c b/libgloss/libsysbase/statvfs.c
 new file mode 100644
-index 0000000..b3dec22
+index 0000000..84e2213
 --- /dev/null
 +++ b/libgloss/libsysbase/statvfs.c
 @@ -0,0 +1,24 @@
@@ -6941,7 +6941,7 @@ index 0000000..044f12d
 +
 diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
 new file mode 100644
-index 0000000..67db6c7
+index 0000000..45e9781
 --- /dev/null
 +++ b/libgloss/libsysbase/times.c
 @@ -0,0 +1,21 @@
@@ -7075,7 +7075,7 @@ index 0000000..9a61639
 +
 diff --git a/libgloss/libsysbase/wait.c b/libgloss/libsysbase/wait.c
 new file mode 100644
-index 0000000..322c847
+index 0000000..f64bf13
 --- /dev/null
 +++ b/libgloss/libsysbase/wait.c
 @@ -0,0 +1,29 @@
@@ -7515,7 +7515,7 @@ index 84219ca..af9d12c 100644
  #if defined(__CYGWIN__) || defined(__rtems__)
  int	_EXFUN(getdtablesize, (void));
 diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
-index 8572821..52b6469 100644
+index 8572821..e6baf35 100644
 --- a/newlib/libc/locale/locale.c
 +++ b/newlib/libc/locale/locale.c
 @@ -107,7 +107,7 @@ beginning with <<"LC_">>.
@@ -7552,14 +7552,44 @@ index 8572821..52b6469 100644
  #ifndef DEFAULT_LOCALE
 -#define DEFAULT_LOCALE	"C"
 +#ifdef __DEFAULT_UTF8__
-+#define DEFAULT_LOCALE	 "C"
-+#else
 +#define DEFAULT_LOCALE	 "C.UTF-8"
++#else
++#define DEFAULT_LOCALE	 "C"
 +#endif
  #endif
  
  #ifdef _MB_CAPABLE
-@@ -255,10 +262,11 @@ const struct __locale_t __C_locale =
+@@ -222,8 +229,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
+ const struct __locale_t __C_locale =
+ {
+   { "C", "C", "C", "C", "C", "C", "C", },
++#if defined ( __DEFAULT_UTF8__ )
++  __utf8_wctomb,
++  __utf8_mbtowc,
++#else
+   __ascii_wctomb,
+   __ascii_mbtowc,
++#endif
+   0,
+   DEFAULT_CTYPE_PTR,
+   {
+@@ -234,9 +246,15 @@ const struct __locale_t __C_locale =
+     CHAR_MAX, CHAR_MAX
+   },
+ #ifndef __HAVE_LOCALE_INFO__
++#ifdef __DEFAULT_UTF8__
++  "\6",
++  "UTF-8",
++  "UTF-8",
++#else
+   "\1",
+   "ASCII",
+   "ASCII",
++#endif
+ #else /* __HAVE_LOCALE_INFO__ */
+   {
+     { NULL, NULL },			/* LC_ALL */
+@@ -255,10 +273,11 @@ const struct __locale_t __C_locale =
  };
  #endif /* _MB_CAPABLE */
  
@@ -7572,7 +7602,23 @@ index 8572821..52b6469 100644
    __utf8_wctomb,
    __utf8_mbtowc,
  #else
-@@ -312,7 +320,7 @@ _DEFUN(_setlocale_r, (p, category, locale),
+@@ -275,9 +294,15 @@ struct __locale_t __global_locale =
+     CHAR_MAX, CHAR_MAX
+   },
+ #ifndef __HAVE_LOCALE_INFO__
++#ifdef __DEFAULT_UTF8__
++  "\6",
++  "UTF-8",
++  "UTF-8",
++#else
+   "\1",
+   "ASCII",
+   "ASCII",
++#endif
+ #else /* __HAVE_LOCALE_INFO__ */
+   {
+     { NULL, NULL },			/* LC_ALL */
+@@ -312,7 +337,7 @@ _DEFUN(_setlocale_r, (p, category, locale),
  {
  #ifndef _MB_CAPABLE
    if (locale)
@@ -7581,7 +7627,7 @@ index 8572821..52b6469 100644
        if (strcmp (locale, "POSIX") && strcmp (locale, "C")
  	  && strcmp (locale, ""))
          return NULL;
-@@ -995,6 +1003,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
+@@ -995,6 +1020,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
  
  const char *
  __locale_ctype_ptr (void)
@@ -7589,6 +7635,80 @@ index 8572821..52b6469 100644
  {
    return __get_current_locale ()->ctype_ptr;
  }
+diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
+index 62ed158..7f34177 100644
+--- a/newlib/libc/machine/arm/Makefile.am
++++ b/newlib/libc/machine/arm/Makefile.am
+@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
+ lib_a_SOURCES = setjmp.S access.c strcmp.S strcpy.c \
+ 		aeabi_memcpy.c aeabi_memcpy-armv7a.S \
+ 		aeabi_memmove.c aeabi_memmove-soft.S \
+-		aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c
++		aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
++		sync_synchronize.c
++
+ lib_a_SOURCES += memchr-stub.c
+ lib_a_SOURCES += memchr.S
+ lib_a_SOURCES += memcpy-stub.c
+diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
+index 4908208..694cbb0 100644
+--- a/newlib/libc/machine/arm/Makefile.in
++++ b/newlib/libc/machine/arm/Makefile.in
+@@ -76,10 +76,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT) \
+ 	lib_a-aeabi_memmove.$(OBJEXT) \
+ 	lib_a-aeabi_memmove-soft.$(OBJEXT) \
+ 	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
+-	lib_a-aeabi_memclr.$(OBJEXT) lib_a-memchr-stub.$(OBJEXT) \
+-	lib_a-memchr.$(OBJEXT) lib_a-memcpy-stub.$(OBJEXT) \
+-	lib_a-memcpy.$(OBJEXT) lib_a-strlen-stub.$(OBJEXT) \
+-	lib_a-strlen.$(OBJEXT)
++	lib_a-aeabi_memclr.$(OBJEXT) lib_a-sync_synchronize.$(OBJEXT) \
++	lib_a-memchr-stub.$(OBJEXT) lib_a-memchr.$(OBJEXT) \
++	lib_a-memcpy-stub.$(OBJEXT) lib_a-memcpy.$(OBJEXT) \
++	lib_a-strlen-stub.$(OBJEXT) lib_a-strlen.$(OBJEXT)
+ lib_a_OBJECTS = $(am_lib_a_OBJECTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp =
+@@ -209,8 +209,8 @@ noinst_LIBRARIES = lib.a
+ lib_a_SOURCES = setjmp.S access.c strcmp.S strcpy.c aeabi_memcpy.c \
+ 	aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
+ 	aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
+-	memchr-stub.c memchr.S memcpy-stub.c memcpy.S strlen-stub.c \
+-	strlen.S
++	sync_synchronize.c memchr-stub.c memchr.S memcpy-stub.c \
++	memcpy.S strlen-stub.c strlen.S
+ lib_a_CCASFLAGS = $(AM_CCASFLAGS)
+ lib_a_CFLAGS = $(AM_CFLAGS)
+ ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
+@@ -374,6 +374,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
+ lib_a-aeabi_memclr.obj: aeabi_memclr.c
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
+ 
++lib_a-sync_synchronize.o: sync_synchronize.c
++	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
++
++lib_a-sync_synchronize.obj: sync_synchronize.c
++	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
++
+ lib_a-memchr-stub.o: memchr-stub.c
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 
+diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
+new file mode 100644
+index 0000000..3acc9e0
+--- /dev/null
++++ b/newlib/libc/machine/arm/sync_synchronize.c
+@@ -0,0 +1,10 @@
++#if __ARM_ARCH < 6
++#include <sys/cdefs.h>
++void __attribute__((weak))
++__sync_synchronize (void)
++{
++  __warn_references (__sync_synchronize,
++		     "legacy compatible __sync_synchronize used. Not suitable for multi-threaded applications");
++  return;
++}
++#endif
 diff --git a/newlib/libc/machine/arm/sys/stdio.h b/newlib/libc/machine/arm/sys/stdio.h
 new file mode 100644
 index 0000000..4eb278e

dkarm-eabi/scripts/build-gcc.sh

@@ -46,7 +46,7 @@ then
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
 	../../gcc-$GCC_VER/configure \
-		--enable-languages=c,c++,objc,obj-c++ \
+		--enable-languages=c,c++ \
 		--with-gnu-as --with-gnu-ld --with-gcc \
 		--with-march=armv4t\
 		--enable-cxx-flags='-ffunction-sections' \
@@ -62,7 +62,7 @@ then
 		--prefix=$prefix \
 		--enable-lto $plugin_ld\
 		--with-system-zlib \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 46" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 47" \
 		$CROSS_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc

makedist.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 DATESTRING=$(date +%Y)$(date +%m)$(date +%d)
 cd .. && tar	--exclude=*CVS* --exclude=.svn --exclude=.git --exclude=*.log --exclude=*.bz2 \
-				--exclude=*.gz --exclude=config.sh --exclude=.devkitARM --exclude=.devkitPPC \
+				--exclude=*.gz --exclude=config.sh --exclude=.devkitARM* --exclude=.devkitPPC* \
-				--exclude=.devkitPSP --exclude=.gitignore \
+				--exclude=.devkitA64* --exclude=.gitignore \
 				-cvjf buildscripts-$DATESTRING.tar.bz2 buildscripts

select_toolchain.sh

@@ -19,6 +19,7 @@ do
   echo
   echo "1: devkitARM (gba gp32 ds)"
   echo "2: devkitPPC (gamecube wii)"
+  echo "3: devkitA64 (switch)"
   read VERSION
 
   if [ "$VERSION" -ne 1 -a "$VERSION" -ne 2 -a "$VERSION" -ne 3 ]
@@ -29,10 +30,10 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=6.3.0
+    GCC_VER=7.1.0
-    BINUTILS_VER=2.27
+    BINUTILS_VER=2.28
     NEWLIB_VER=2.5.0
-    GDB_VER=7.12
+    GDB_VER=8.0
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
@@ -49,4 +50,14 @@ case "$VERSION" in
     target=powerpc-eabi
     toolchain=DEVKITPPC
   ;;
+  "3" )
+    GCC_VER=7.3.0
+    BINUTILS_VER=2.30
+    NEWLIB_VER=3.0.0
+    GDB_VER=8.0
+    basedir='dka64'
+    package=devkitA64
+    target=aarch64-none-elf
+    toolchain=DEVKITA64
+  ;;
 esac