devkitARM: remove old gcc patch

remove library building from scripts
devkitARM: latest newlib patch
2026-08-21 01:44:16 -05:00 · 2019-06-28 16:07:20 +01:00 · 2019-06-25 22:04:51 +01:00 · 2019-06-25 20:28:26 +01:00 · 2019-06-23 10:54:29 +01:00 · 2019-05-14 10:22:19 +01:00
21 changed files with 3550 additions and 994 deletions
--- a/README.TXT
+++ b/README.TXT
@@ -39,7 +39,7 @@ http://www.zlib.net
 http://www.libusb.org
 http://expat.sourceforge.net/
-sudo apt-get install  libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
+sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
 Building gxtexconv for cube/wii needs GL/gl.h which can be obtained with
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 51
+#	devkitARM release 53-1
-#	devkitPPC release 33
+#	devkitPPC release 35
-#	devkitA64 release 12
+#	devkitA64 release 13
 #---------------------------------------------------------------------------------
 if [ 0 -eq 1 ] ; then
@@ -28,17 +28,10 @@ echo
 GENERAL_TOOLS_VER=1.0.2
 LIBGBA_VER=0.5.2
 GBATOOLS_VER=1.1.0
 DKARM_RULES_VER=1.0.0
 DKARM_CRTLS_VER=1.0.0
 LIBNDS_VER=1.7.2
 DEFAULT_ARM7_VER=0.7.4
 DSWIFI_VER=0.4.2
 MAXMOD_VER=1.0.11
 FILESYSTEM_VER=0.9.14
 LIBFAT_VER=1.1.3
 DSTOOLS_VER=1.2.1
 GRIT_VER=0.8.15
 NDSTOOL_VER=2.1.1
@@ -48,13 +41,9 @@ DFU_UTIL_VER=0.9.1
 STLINK_VER=1.2.3
 GAMECUBE_TOOLS_VER=1.0.2
 LIBOGC_VER=1.8.21
 WIILOAD_VER=0.5.1
 DKPPC_RULES_VER=1.0.0
 LIBCTRU_VER=1.5.1
 CITRO3D_VER=1.5.0
 CITRO2D_VER=1.1.0
 TOOLS3DS_VER=1.1.4
 LINK3DS_VER=0.5.2
 PICASSO_VER=2.7.0
@@ -64,7 +53,6 @@ GP32_TOOLS_VER=1.0.3
 LIBMIRKO_VER=0.9.8
 SWITCH_TOOLS_VER=1.4.1
 LIBNX_VER=1.3.0
 OSXMIN=${OSXMIN:-10.9}
@@ -218,12 +206,6 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_
 if [ $VERSION -eq 1 ]; then
 	targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
 		libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
 		default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
 		libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2  citro3d-src-${CITRO3D_VER}.tar.bz2
 		citro2d-src-${CITRO2D_VER}.tar.bz2"
 	hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
 		dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
 		general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
@@ -235,8 +217,6 @@ fi
 if [ $VERSION -eq 2 ]; then
 	targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
 	hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
 	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
@@ -244,8 +224,6 @@ fi
 if [ $VERSION -eq 3 ]; then
 	targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
 	hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
 fi
@@ -258,7 +236,7 @@ else
 fi
 cd "$SRCDIR"
-for archive in $archives $targetarchives $hostarchives
+for archive in $archives $hostarchives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
@@ -279,16 +257,6 @@ if [ $VERSION -eq 2 ]; then
 	extract_and_patch binutils $MN_BINUTILS_VER bz2
 fi
 for archive in $targetarchives
 do
 	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
 	echo $destdir
 	if [ ! -d $destdir ]; then
 		mkdir -p $destdir
 		bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
 	fi
 done
 for archive in $hostarchives
 do
 	destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
@@ -306,10 +274,6 @@ if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; the
 . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
 fi
 if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
  . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
 fi
 cd $BUILDSCRIPTDIR
 if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
--- a/config.sh.sample
+++ b/config.sh.sample
@@ -35,12 +35,6 @@ BUILD_DKPRO_PACKAGE=0
 #---------------------------------------------------------------------------------
 #BUILD_DKPRO_SKIP_TOOLS=1
 #---------------------------------------------------------------------------------
 # Uncomment to skip building of libraries
 #---------------------------------------------------------------------------------
 #BUILD_DKPRO_SKIP_LIBRARIES=1
 # Automated script execution
 #---------------------------------------------------------------------------------
 #  0: Ask to delete build folders & patched sources
--- a/dka64/patches/binutils-2.31.1.patch
+++ b/dka64/patches/binutils-2.31.1.patch
@@ -1,346 +0,0 @@
 diff -NBaur binutils-2.31.1/bfd/elfnn-aarch64.c binutils-2.31.1-dka64/bfd/elfnn-aarch64.c
 --- binutils-2.31.1/bfd/elfnn-aarch64.c	2018-06-25 12:44:16.000000000 +0100
 +++ binutils-2.31.1-dka64/bfd/elfnn-aarch64.c	2018-07-27 18:11:15.757082269 +0100
@@ -2342,6 +2342,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.  */
@@ -6370,11 +6376,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);
@@ -6509,6 +6517,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 (input_bfd, r_type))
 	{
 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
@@ -6532,7 +6544,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);
@@ -6627,7 +6639,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);
@@ -6676,7 +6688,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);
@@ -7019,6 +7031,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
@@ -8221,6 +8253,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)
@@ -8240,6 +8273,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
@@ -8249,7 +8286,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))
@@ -8283,6 +8320,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;
@@ -8305,6 +8347,7 @@
 	  htab->root.srelplt->reloc_count++;
 	}
 +	}
       else
 	{
 	  h->plt.offset = (bfd_vma) - 1;
@@ -8317,9 +8360,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;
@@ -8331,7 +8371,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))
@@ -8345,7 +8385,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))
@@ -8381,7 +8421,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
@@ -8447,7 +8487,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;
@@ -8467,7 +8507,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
@@ -8478,6 +8520,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;
@@ -9098,8 +9141,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;
@@ -9134,7 +9186,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.  */
@@ -9153,10 +9205,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;
@@ -9650,6 +9703,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.31.1/ld/emulparams/aarch64elf32.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh
 --- binutils-2.31.1/ld/emulparams/aarch64elf32.sh	2018-06-24 19:38:57.000000000 +0100
 +++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh	2018-07-27 18:04:52.585317513 +0100
@@ -1,3 +1,5 @@
 +. ${srcdir}/emulparams/dynamic_undefined_weak.sh
 +
 ARCH="aarch64:ilp32"
 MACHINE=
 NOP=0x1f2003d5
 diff -NBaur binutils-2.31.1/ld/emulparams/aarch64elf.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh
 --- binutils-2.31.1/ld/emulparams/aarch64elf.sh	2018-06-24 19:38:57.000000000 +0100
 +++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh	2018-07-27 18:04:52.585317513 +0100
@@ -1,3 +1,5 @@
 +. ${srcdir}/emulparams/dynamic_undefined_weak.sh
 +
 ARCH=aarch64
 MACHINE=
 NOP=0x1f2003d5
 diff -NBaur binutils-2.31.1/ld/emultempl/aarch64elf.em binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em
 --- binutils-2.31.1/ld/emultempl/aarch64elf.em	2018-06-26 12:27:20.000000000 +0100
 +++ binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em	2018-07-27 18:04:52.585317513 +0100
@@ -380,7 +380,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\n"
 diff -NBaur binutils-2.31.1/ld/Makefile.am binutils-2.31.1-dka64/ld/Makefile.am
 --- binutils-2.31.1/ld/Makefile.am	2018-06-24 19:38:57.000000000 +0100
 +++ binutils-2.31.1-dka64/ld/Makefile.am	2018-07-27 18:04:52.585317513 +0100
@@ -1495,19 +1495,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.31.1/ld/Makefile.in binutils-2.31.1-dka64/ld/Makefile.in
 --- binutils-2.31.1/ld/Makefile.in	2018-07-18 08:46:21.000000000 +0100
 +++ binutils-2.31.1-dka64/ld/Makefile.in	2018-07-27 18:04:52.585317513 +0100
@@ -3097,18 +3097,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 \
--- a/dka64/patches/binutils-2.32.patch
+++ b/dka64/patches/binutils-2.32.patch
@@ -0,0 +1,604 @@
 diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
 index 5741c60264..fb5d9d069c 100644
 --- a/bfd/elf-bfd.h
 +++ b/bfd/elf-bfd.h
@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
     asection *sec;
   } build_id;
 +  /* Data for .nx-module-name. */
 +  struct
 +  {
 +    bfd_boolean (*after_write_object_contents) (bfd *);
 +    const char *name;
 +    asection *sec;
 +  } nx_module_name;
 +
   /* Records the result of `get_program_header_size'.  */
   bfd_size_type program_header_size;
 diff --git a/bfd/elf.c b/bfd/elf.c
 index eb3e1828e9..bc6bb48804 100644
 --- a/bfd/elf.c
 +++ b/bfd/elf.c
@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
   if (!bed->s->write_shdrs_and_ehdr (abfd))
     return FALSE;
 +  /* Write out the NX module name. */
 +  if (t->o->nx_module_name.after_write_object_contents != NULL)
 +    {
 +      failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
 +      if (failed)
 +        return FALSE;
 +    }
 +
   /* This is last since write_shdrs_and_ehdr can touch i_shdrp[0].  */
   if (t->o->build_id.after_write_object_contents != NULL)
     return (*t->o->build_id.after_write_object_contents) (abfd);
 diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
 index faa27611d4..888af6bcd8 100644
 --- a/bfd/elfnn-aarch64.c
 +++ b/bfd/elfnn-aarch64.c
@@ -2341,6 +2341,12 @@ enum elf_aarch64_stub_type
   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.  */
@@ -6436,11 +6442,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
       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);
@@ -6576,6 +6584,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
 					       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 (input_bfd, r_type))
 	{
 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
@@ -6599,7 +6611,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
 	      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);
@@ -6694,7 +6706,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
 	      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);
@@ -6743,7 +6755,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
 	      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);
@@ -7086,6 +7098,26 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
   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
@@ -8286,6 +8318,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
   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)
@@ -8305,6 +8338,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
   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
@@ -8314,7 +8351,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
     {
       /* 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))
@@ -8348,6 +8385,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	     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;
@@ -8370,6 +8412,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	  htab->root.srelplt->reloc_count++;
 	}
 +	}
       else
 	{
 	  h->plt.offset = (bfd_vma) - 1;
@@ -8382,9 +8425,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
       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;
@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
       /* 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))
@@ -8410,7 +8450,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	{
 	  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))
@@ -8446,7 +8486,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	    }
 	  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
@@ -8512,7 +8552,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	 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;
@@ -8532,7 +8572,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	 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
@@ -8543,6 +8585,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 	     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;
@@ -9163,8 +9206,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
 				     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;
@@ -9199,7 +9251,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
 	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.  */
@@ -9218,10 +9270,11 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
     }
   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;
@@ -9715,6 +9768,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
 #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 --git a/ld/Makefile.am b/ld/Makefile.am
 index c2c798b4fe..a0073d27fe 100644
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
@@ -1509,19 +1509,23 @@ ens32knbsd.c:	$(srcdir)/emulparams/ns32knbsd.sh \
   $(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 --git a/ld/Makefile.in b/ld/Makefile.in
 index fc687fc516..7d85865d92 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
@@ -3114,18 +3114,22 @@ ens32knbsd.c:	$(srcdir)/emulparams/ns32knbsd.sh \
 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 \
 diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
 index 4a59342722..2aa1ec7712 100644
 --- a/ld/emulparams/aarch64elf.sh
 +++ b/ld/emulparams/aarch64elf.sh
@@ -1,3 +1,5 @@
 +. ${srcdir}/emulparams/dynamic_undefined_weak.sh
 +
 ARCH=aarch64
 MACHINE=
 NOP=0x1f2003d5
 diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
 index 38bcd4bbb0..da0f411feb 100644
 --- a/ld/emulparams/aarch64elf32.sh
 +++ b/ld/emulparams/aarch64elf32.sh
@@ -1,3 +1,5 @@
 +. ${srcdir}/emulparams/dynamic_undefined_weak.sh
 +
 ARCH="aarch64:ilp32"
 MACHINE=
 NOP=0x1f2003d5
 diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
 index 45e40b510c..916ef2086a 100644
 --- a/ld/emultempl/aarch64elf.em
 +++ b/ld/emultempl/aarch64elf.em
@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
   { "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\n"
 diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
 index f4f7ad6b4e..8428a54697 100644
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
@@ -192,6 +192,9 @@ static char *depaudit; /* colon (typically) separated list of libs */
 /* Style of .note.gnu.build-id section.  */
 static const char *emit_note_gnu_build_id;
 +/* NX module name. */
 +static const char *emit_nx_module_name;
 +
 /* On Linux, it's possible to have different versions of the same
    shared library linked against different versions of libc.  The
    dynamic linker somehow tags which libc version to use in
@@ -1217,6 +1220,92 @@ setup_build_id (bfd *ibfd)
   return FALSE;
 }
 +static bfd_boolean
 +write_nx_module_name (bfd *abfd)
 +{
 +  struct elf_obj_tdata *t = elf_tdata (abfd);
 +  const char *name;
 +  asection *asec;
 +  Elf_Internal_Shdr *i_shdr;
 +  unsigned char *contents;
 +  bfd_size_type size;
 +  file_ptr position;
 +
 +  name = t->o->nx_module_name.name;
 +  asec = t->o->nx_module_name.sec;
 +  if (bfd_is_abs_section (asec->output_section))
 +    {
 +      einfo (_("%P: warning: .nx-module-name section discarded,"
 +	       " --build-id ignored\n"));
 +      return TRUE;
 +    }
 +  i_shdr = &elf_section_data (asec->output_section)->this_hdr;
 +
 +  if (i_shdr->contents == NULL)
 +    {
 +      if (asec->contents == NULL)
 +	asec->contents = (unsigned char *) xmalloc (asec->size);
 +      contents = asec->contents;
 +    }
 +  else
 +    contents = i_shdr->contents + asec->output_offset;
 +
 +  size = asec->size;
 +  bfd_h_put_32 (abfd, 0, &contents[0]);
 +  bfd_h_put_32 (abfd, size - 9, &contents[4]);
 +  memcpy (&contents[8], name, size - 9);
 +  contents[size - 1] = 0; /* ensure null termination for AMS */
 +
 +  position = i_shdr->sh_offset + asec->output_offset;
 +
 +  return (bfd_seek (abfd, position, SEEK_SET) == 0
 +	  && bfd_bwrite (contents, size, abfd) == size);
 +}
 +
 +/* Make .nx-module-name section, and set up elf_tdata->nx_module_name.  */
 +
 +static bfd_boolean
 +setup_nx_module_name (bfd *ibfd, bfd *obfd)
 +{
 +  asection *s;
 +  bfd_size_type size;
 +  flagword flags;
 +
 +  if (emit_nx_module_name[0] == '\0')
 +    {
 +      /* Extract the basename of the output bfd and use it as the module name. */
 +      char *dot_pos;
 +      free ((char *) emit_nx_module_name);
 +      emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
 +      emit_nx_module_name = xstrdup (emit_nx_module_name);
 +      dot_pos = strrchr (emit_nx_module_name, '.');
 +      if (dot_pos != NULL)
 +        {
 +          /* Remove extension. */
 +          *dot_pos = 0;
 +        }
 +    }
 +
 +  size = 8 + strlen(emit_nx_module_name) + 1; /* extra null terminator for AMS */
 +  flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
 +	   | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
 +  s = bfd_make_section_with_flags (ibfd, ".nx-module-name", flags);
 +  if (s != NULL && bfd_set_section_alignment (ibfd, s, 4))
 +    {
 +      struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd);
 +      t->o->nx_module_name.after_write_object_contents = &write_nx_module_name;
 +      t->o->nx_module_name.name = emit_nx_module_name;
 +      t->o->nx_module_name.sec = s;
 +      elf_section_type (s) = SHT_PROGBITS;
 +      s->size = size;
 +      return TRUE;
 +    }
 +
 +  einfo (_("%P: warning: cannot create .nx-module-name section,"
 +	   " --nx-module-name ignored\n"));
 +  return FALSE;
 +}
 +
 /* This is called after all the input files have been opened.  */
 static void
@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
 	}
     }
 +  if (emit_nx_module_name != NULL)
 +    {
 +      /* Find an ELF input.  */
 +      for (abfd = link_info.input_bfds;
 +        abfd != (bfd *) NULL; abfd = abfd->link.next)
 +        if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
 +            && bfd_count_sections (abfd) != 0
 +            && !((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
 +          break;
 +
 +      /* If there are no ELF input files do not try to create a .nx-module-name section. */
 +      if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
 +        {
 +          free ((char *) emit_nx_module_name);
 +          emit_nx_module_name = NULL;
 +        }
 +    }
 +
   get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
   if (bfd_link_relocatable (&link_info))
@@ -2720,6 +2827,7 @@ enum elf_options
   OPTION_EXCLUDE_LIBS,
   OPTION_HASH_STYLE,
   OPTION_BUILD_ID,
 +  OPTION_NX_MODULE_NAME,
   OPTION_AUDIT,
   OPTION_COMPRESS_DEBUG
 };
@@ -2750,6 +2858,7 @@ EOF
 fi
 fragment <<EOF
     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
 +    {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
     {"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
 EOF
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
@@ -2814,6 +2923,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
 	einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
 	       optarg);
       break;
 +    case OPTION_NX_MODULE_NAME:
 +      if (emit_nx_module_name != NULL)
 +        {
 +          free ((char *) emit_nx_module_name);
 +          emit_nx_module_name = NULL;
 +        }
 +      if (optarg == NULL)
 +        optarg = "";
 +      emit_nx_module_name = xstrdup (optarg);
 +      break;
 EOF
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 diff --git a/ld/ldgram.y b/ld/ldgram.y
 index c3eadeb392..59ab143526 100644
 --- a/ld/ldgram.y
 +++ b/ld/ldgram.y
@@ -819,6 +819,7 @@ origin_spec:
 	ORIGIN '=' mustbe_exp
 		{
 		  region->origin_exp = $3;
 +		  region->current = region->origin;
 		}
 	;
 diff --git a/ld/ldlang.c b/ld/ldlang.c
 index 33f6bda292..7161f4210a 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
@@ -7381,9 +7381,6 @@ lang_process (void)
   current_target = default_target;
   lang_statement_iteration++;
   open_input_bfds (statement_list.head, OPEN_BFD_NORMAL);
 -  /* open_input_bfds also handles assignments, so we can give values
 -     to symbolic origin/length now.  */
 -  lang_do_memory_regions ();
 #ifdef ENABLE_PLUGINS
   if (link_info.lto_plugin_active)
@@ -7526,6 +7523,8 @@ lang_process (void)
   /* PR 13683: We must rerun the assignments prior to running garbage
      collection in order to make sure that all symbol aliases are resolved.  */
   lang_do_assignments (lang_mark_phase_enum);
 +
 +  lang_do_memory_regions();
   expld.phase = lang_first_phase_enum;
   /* Size up the common data.  */
@@ -7610,11 +7609,8 @@ lang_process (void)
   /* Fix any __start, __stop, .startof. or .sizeof. symbols.  */
   lang_finalize_start_stop ();
 -  /* Do all the assignments again, to report errors.  Assignment
 -     statements are processed multiple times, updating symbols; In
 -     open_input_bfds, lang_do_assignments, and lang_size_sections.
 -     Since lang_relax_sections calls lang_do_assignments, symbols are
 -     also updated in ldemul_after_allocation.  */
 +  /* Do all the assignments, now that we know the final resting places
 +     of all the symbols.  */
   lang_do_assignments (lang_final_phase_enum);
   ldemul_finish ();
--- a/dka64/patches/gcc-8.3.0.patch
+++ b/dka64/patches/gcc-8.3.0.patch
@@ -1,12 +1,17 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 532c33f4c2b..c8a8bc698a7 100644
+index 7af8e028104..90a3a50f624 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -945,6 +945,7 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -945,6 +945,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
 	case $target in
 	aarch64-*-elf*)
 		use_gcc_stdint=wrap
 +		tm_file="${tm_file} devkitpro.h"
 +		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
 +		extra_options="${extra_options} devkitpro.opt"
 +		case ${enable_threads} in
 +			"" | yes | posix) thread_file='posix' ;;
 +		esac
 		;;
         aarch64-*-fuchsia*)
                 tm_file="${tm_file} fuchsia.h"
@@ -40,10 +45,10 @@ index 7a5c6d7664f..687793841de 100644
    Most have a PIC and non-PIC variant.  */
 enum aarch64_code_model {
 diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
-index 175f13dc264..733ab473cbd 100644
+index 349ca0c047b..5c03c42c28e 100644
 --- a/gcc/config/aarch64/aarch64.c
 +++ b/gcc/config/aarch64/aarch64.c
-@@ -11979,8 +11979,24 @@ aarch64_load_tp (rtx target)
+@@ -12005,8 +12005,24 @@ aarch64_load_tp (rtx target)
       || !register_operand (target, Pmode))
     target = gen_reg_rtx (Pmode);
@@ -153,6 +158,78 @@ index 0be1f0d63aa..a54068bfd96 100644
 +MULTILIB_DIRNAMES   = large pic
 +MULTILIB_REQUIRED   = mcmodel=large fPIC
 +MULTILIB_MATCHES    = fPIC=fpic fPIC=fpie fPIC=fPIE
 diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
 index 00000000000..11ba0f5ab1c
 --- /dev/null
 +++ b/gcc/config/devkitpro.h
@@ -0,0 +1,31 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
 +   This file is part of GCC.
 +
 +   GCC 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, or (at your
 +   option) any later version.
 +
 +   GCC 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.
 +
 +   Under Section 7 of GPL version 3, you are granted additional
 +   permissions described in the GCC Runtime Library Exception, version
 +   3.1, as published by the Free Software Foundation.
 +
 +   You should have received a copy of the GNU General Public License and
 +   a copy of the GCC Runtime Library Exception along with this program;
 +   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 +   <http://www.gnu.org/licenses/>.  */
 +
 +#undef TARGET_OS_CPP_BUILTINS
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
 +    } while (0)
 +
 +
 diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
 new file mode 100644
 index 00000000000..9acbbf9d27c
 --- /dev/null
 +++ b/gcc/config/devkitpro.opt
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
 +; Copyright (C) 2011-2018 Free Software Foundation, Inc.
 +;
 +; This file is part of GCC.
 +;
 +; GCC 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, or (at your option) any later
 +; version.
 +;
 +; GCC 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 GCC; see the file COPYING3.  If not see
 +; <http://www.gnu.org/licenses/>.
 +
 +; See the GCC internals manual (options.texi) for a description of
 +; this file's format.
 +
 +; Please try to keep this file in ASCII collating order.
 +
 +pthread
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
 diff --git a/gcc/gcc.c b/gcc/gcc.c
 index a716f708259..6a11011dba7 100644
 --- a/gcc/gcc.c
@@ -197,3 +274,40 @@ index 5e894455e16..f2347455de0 100644
 /* FIXME: Including auto-host is incorrect, but until we have
    identified the set of defines that need to go into auto-target.h,
 diff --git a/libgcc/gthr.h b/libgcc/gthr.h
 index 88b0178f9e3..e94fcf9d721 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* The pe-coff weak support isn't fully compatible to ELF's weak.
    For static libraries it might would work, but as we need to deal
    with shared versions too, we disable it for mingw-targets.  */
 -#ifdef __MINGW32__
 +#if defined(__MINGW32__) || defined(__DEVKITA64__)
 #undef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 0
 #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
 index 77e6dc2f6be..3a102997371 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
@@ -1293,6 +1293,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
 +	    -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
 index 948a5c1f1c5..ee8e240f6c5 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
@@ -1719,6 +1719,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
 +	    -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
--- a/dka64/patches/gdb-8.2.1.patch
+++ b/dka64/patches/gdb-8.2.1.patch
@@ -0,0 +1,60 @@
 diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
 --- gdb-8.2.1/gdb/dtrace-probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/dtrace-probe.c	2019-03-23 19:45:04.743529457 +0000
@@ -100,7 +100,7 @@
 /* DTrace static_probe_ops.  */
 -const dtrace_static_probe_ops dtrace_static_probe_ops;
 +const dtrace_static_probe_ops dtrace_static_probe_ops = {};
 /* The following structure represents a dtrace probe.  */
 diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
 --- gdb-8.2.1/gdb/probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/probe.c	2019-03-23 19:35:59.701401090 +0000
@@ -60,7 +60,7 @@
 /* Static operations associated with a generic probe.  */
 -const any_static_probe_ops any_static_probe_ops;
 +const any_static_probe_ops any_static_probe_ops = {};
 /* A helper for parse_probes that decodes a probe specification in
    SEARCH_PSPACE.  It appends matching SALs to RESULT.  */
 diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
 --- gdb-8.2.1/gdb/record-btrace.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/record-btrace.c	2019-03-23 19:35:59.705388987 +0000
@@ -144,7 +144,7 @@
 /* Token associated with a new-thread observer enabling branch tracing
    for the new thread.  */
 -static const gdb::observers::token record_btrace_thread_observer_token;
 +static const gdb::observers::token record_btrace_thread_observer_token = {};
 /* Memory access types used in set/show record btrace replay-memory-access.  */
 static const char replay_memory_access_read_only[] = "read-only";
 diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
 --- gdb-8.2.1/gdb/stap-probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/stap-probe.c	2019-03-23 19:35:59.705388987 +0000
@@ -119,7 +119,7 @@
 /* SystemTap static_probe_ops.  */
 -const stap_static_probe_ops stap_static_probe_ops;
 +const stap_static_probe_ops stap_static_probe_ops = {};
 class stap_probe : public probe
 {
 diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
 --- gdb-8.2.1/gdb/tui/tui-hooks.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c	2019-03-23 19:35:59.705388987 +0000
@@ -205,7 +205,7 @@
 /* Token associated with observers registered while TUI hooks are
    installed.  */
 -static const gdb::observers::token tui_observers_token;
 +static const gdb::observers::token tui_observers_token = {};
 /* Attach or detach a single observer, according to ATTACH.  */
--- a/dka64/patches/newlib-3.1.0.patch
+++ b/dka64/patches/newlib-3.1.0.patch
--- a/dka64/scripts/build-gcc.sh
+++ b/dka64/scripts/build-gcc.sh
@@ -64,7 +64,7 @@ then
 		--prefix=$prefix \
 		--enable-lto $plugin_ld\
 		--with-system-zlib \
-		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 12" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 13" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
--- a/dka64/scripts/build-libs.sh
+++ b/dka64/scripts/build-libs.sh
@@ -1,7 +0,0 @@
 #!/bin/sh
 export DEVKITPRO=$TOOLPATH
 cd $BUILDDIR/libnx-$LIBNX_VER
 $MAKE || { echo "error building libnx"; exit 1; }
 $MAKE install || { echo "error installing libnx"; exit 1; }
--- a/dkarm-eabi/patches/gcc-9.1.0.patch
+++ b/dkarm-eabi/patches/gcc-9.1.0.patch
@@ -1,8 +1,8 @@
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 545321b0bbe..63ed77af8fd 100644
+index 3a55f6ac6d2..1a16dcc1c74 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
-@@ -395,7 +395,7 @@ begin arch armv6k
+@@ -352,7 +352,7 @@ begin arch armv6k
  tune for mpcore
  tune flags CO_PROC
  base 6K
@@ -12,16 +12,16 @@ index 545321b0bbe..63ed77af8fd 100644
  optalias vfpv2 fp
  option nofp remove ALL_FP
 diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
-index 9ec5bf065ac..9ab3ffb109d 100644
+index 8911d489f14..b1976386bab 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
+-# Copyright (C) 1998-2019 Free Software Foundation, Inc.
 +# Copyright (C) 1998-2017 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
-@@ -16,110 +16,83 @@
+@@ -16,111 +16,14 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
@@ -48,14 +48,15 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -v8_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
 -
 -# We don't do anything special with these.  Pre-v4t probably doesn't work.
-all_early_nofp	:= armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t
+-all_early_nofp	:= armv4 armv4t armv5t
 -
-all_early_arch	:= armv5e armv5tej armv6 armv6j armv6k armv6z armv6kz \
+-all_early_arch	:= armv5tej armv6 armv6j armv6k armv6z armv6kz \
 -		   armv6zk armv6t2 iwmmxt iwmmxt2
 -
 -all_v7_a_r	:= armv7-a armv7ve armv7-r
 -
-all_v8_archs	:= armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a
+-all_v8_archs	:= armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
 -		   armv8.5-a
 -
 -# No floating point variants, require thumb1 softfp
 -all_nofp_t	:= armv6-m armv6s-m armv8-m.base
@@ -114,16 +115,19 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
-
+ 
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
-
+MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
 -			  march?armv7+fp=march?$(ARCH)+fp.dp)
-
+ 
 -# PART 4 - Reuse rules
 +MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
 +MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
 -MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
@@ -134,83 +138,8 @@ index 9ec5bf065ac..9ab3ffb109d 100644
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
 +MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
 +
 +
 +MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
 +MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
 +
 +
 +
 +#MULTILIB_OPTIONS     += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
 +#MULTILIB_DIRNAMES    += fa526 fa626 fa606te fa626te fmp626 fa726te
 +#MULTILIB_EXCEPTIONS  += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
 +
 +#MULTILIB_OPTIONS      += march=armv7
 +#MULTILIB_DIRNAMES     += thumb2
 +#MULTILIB_EXCEPTIONS   += march=armv7* marm/*march=armv7*
 +#MULTILIB_MATCHES      += march?armv7=march?armv7-a
 +#MULTILIB_MATCHES      += march?armv7=march?armv7-r
 +#MULTILIB_MATCHES      += march?armv7=march?armv7-m
 +#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-a8
 +#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-r4
 +#MULTILIB_MATCHES      += march?armv7=mcpu?cortex-m3
 +
 +# Not quite true.  We can support hard-vfp calling in Thumb2, but how do we
 +# express that here?  Also, we really need architecture v5e or later
 +# (mcrr etc).
 +#MULTILIB_OPTIONS       += mfloat-abi=hard
 +#MULTILIB_DIRNAMES      += fpu
 +#MULTILIB_EXCEPTIONS    += *mthumb/*mfloat-abi=hard*
 +#MULTILIB_EXCEPTIONS    += *mcpu=fa526/*mfloat-abi=hard*
 +#MULTILIB_EXCEPTIONS    += *mcpu=fa626/*mfloat-abi=hard*
 +
 +# MULTILIB_OPTIONS    += mcpu=ep9312
 +# MULTILIB_DIRNAMES   += ep9312
 +# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
 +#	
 +# MULTILIB_OPTIONS     += mlittle-endian/mbig-endian
 +# MULTILIB_DIRNAMES    += le be
 +# MULTILIB_MATCHES     += mbig-endian=mbe mlittle-endian=mle
 +# 
 +# MULTILIB_OPTIONS    += mfloat-abi=hard/mfloat-abi=soft
 +# MULTILIB_DIRNAMES   += fpu soft
 +# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
 +# 
 +# MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
 +# MULTILIB_DIRNAMES   += normal interwork
 +# 
 +# MULTILIB_OPTIONS    += fno-leading-underscore/fleading-underscore
 +# MULTILIB_DIRNAMES   += elf under
 +# 
 +# MULTILIB_OPTIONS    += mcpu=arm7
 +# MULTILIB_DIRNAMES   += nofmult
 +# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7*
 +# # Note: the multilib_exceptions matches both -mthumb and
 +# # -mthumb-interwork
 +# #
 +# # We have to match all the arm cpu variants which do not have the
 +# # multiply instruction and treat them as if the user had specified
 +# # -mcpu=arm7.  Note that in the following the ? is interpreted as
 +# # an = for the purposes of matching command line options.
 +# # FIXME: There ought to be a better way to do this.
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7d
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7di
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm70
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm700
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm700i
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm710
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm710c
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7100
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7500
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm7500fe
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm6
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm60
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm600
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm610
 +# MULTILIB_MATCHES    += mcpu?arm7=mcpu?arm620
 diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index 12dd0931b08..59584fe64bc 100644
+index cf9ba6b4dc0..008d7555ecb 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
@@ -29,7 +29,7 @@
@@ -222,22 +151,18 @@ index 12dd0931b08..59584fe64bc 100644
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC	\
-@@ -93,4 +93,9 @@
+@@ -93,4 +93,5 @@
    udivmoddi4, which will depend on the exception unwind routines,
    which will depend on abort, which is defined in libc.  */ 
 #undef LINK_GCC_C_SEQUENCE_SPEC
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
+-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
 +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
 +
 +/* The system headers under devkitARM are C++-aware.  */
 +#undef NO_IMPLICIT_EXTERN_C
 +#define NO_IMPLICIT_EXTERN_C
 +
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a716f708259..6a11011dba7 100644
+index 4f57765b012..2899202cc05 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -786,6 +786,11 @@ proper position among the other output files.  */
+@@ -794,6 +794,11 @@ proper position among the other output files.  */
 #endif
 #endif
@@ -249,7 +174,7 @@ index a716f708259..6a11011dba7 100644
 /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC  \
-@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC;
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -257,7 +182,7 @@ index a716f708259..6a11011dba7 100644
 static const char *endfile_spec = ENDFILE_SPEC;
 static const char *startfile_spec = STARTFILE_SPEC;
 static const char *linker_name_spec = LINKER_NAME;
-@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
+@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] =
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -276,7 +201,7 @@ index dddddc7c444..c2502597953 100644
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 5e894455e16..f81c9c6a64c 100644
+index 4927a9f8977..2a79e3e137d 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
--- a/dkarm-eabi/patches/gdb-8.2.1.patch
+++ b/dkarm-eabi/patches/gdb-8.2.1.patch
@@ -1,7 +1,29 @@
-diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
--- gdb-8.2.1/gdb/arm-3ds-tdep.c	1970-01-01 01:00:00.000000000 +0100
+index 9799a7a65d..ccd3f8a626 100644
-+++ gdb-8.2.1-apple/gdb/arm-3ds-tdep.c	2019-02-19 17:15:22.100604954 +0000
+--- a/gdb/Makefile.in
-@@ -0,0 +1,157 @@
+++ b/gdb/Makefile.in
@@ -684,6 +684,7 @@ ALL_TARGET_OBS = \
 	arch/arm-linux.o \
 	arch/i386.o \
 	arch/ppc-linux-common.o \
 +	arm-3ds-tdep.o \
 	arm-bsd-tdep.o \
 	arm-fbsd-tdep.o \
 	arm-linux-tdep.o \
@@ -2213,6 +2214,7 @@ ALLDEPFILES = \
 	amd64-tdep.c \
 	arc-tdep.c \
 	arm.c \
 +	arm-3ds-tdep.c \
 	arm-bsd-tdep.c \
 	arm-fbsd-nat.c \
 	arm-fbsd-tdep.c \
 diff --git a/gdb/arm-3ds-tdep.c b/gdb/arm-3ds-tdep.c
 new file mode 100644
 index 0000000000..c41336982b
 --- /dev/null
 +++ b/gdb/arm-3ds-tdep.c
@@ -0,0 +1,291 @@
 +/* Target-dependent code for 3DS. */
 +
 +/* This uses code from GDB, which license is: */
@@ -49,6 +71,32 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  NULL,
 +};
 +
 +/* single_step() is called just before we want to resume the inferior,
 +   if we want to single-step it but there is no hardware or kernel
 +   single-step support.  We find the target of the coming instructions
 +   and breakpoint them.  */
 +
 +std::vector<CORE_ADDR>
 +arm_3ds_software_single_step (struct regcache *regcache)
 +{
 +  struct gdbarch *gdbarch = regcache->arch ();
 +  struct arm_get_next_pcs next_pcs_ctx;
 +
 +  arm_get_next_pcs_ctor (&next_pcs_ctx,
 +			 &arm_3ds_get_next_pcs_ops,
 +			 gdbarch_byte_order (gdbarch),
 +			 gdbarch_byte_order_for_code (gdbarch),
 +			 0,
 +			 regcache);
 +
 +  std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
 +
 +  for (CORE_ADDR &pc_ref : next_pcs)
 +    pc_ref = gdbarch_addr_bits_remove (gdbarch, pc_ref);
 +
 +  return next_pcs;
 +}
 +
 +static CORE_ADDR
 +arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
 +{
@@ -124,6 +172,108 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  return svc_number;
 +}
 +
 +/* Implement the breakpoint_kind_from_pc gdbarch method.  */
 +
 +static int
 +arm_3ds_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
 +{
 +  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 +  enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch);
 +
 +  if (arm_pc_is_thumb (gdbarch, *pcptr))
 +    {
 +      *pcptr = UNMAKE_THUMB_ADDR (*pcptr);
 +
 +      /* If we have a separate 32-bit breakpoint instruction for Thumb-2,
 +	 check whether we are replacing a 32-bit instruction.  */
 +      if (tdep->thumb2_breakpoint != NULL)
 +	{
 +	  gdb_byte buf[2];
 +
 +	  if (target_read_memory (*pcptr, buf, 2) == 0)
 +	    {
 +	      unsigned short inst1;
 +
 +	      inst1 = extract_unsigned_integer (buf, 2, byte_order_for_code);
 +	      if (thumb_insn_size (inst1) == 4)
 +		return ARM_BP_KIND_THUMB2;
 +	    }
 +	}
 +
 +      return ARM_BP_KIND_THUMB;
 +    }
 +  else
 +    return ARM_BP_KIND_ARM;
 +
 +}
 +
 +/* Implement the sw_breakpoint_from_kind gdbarch method.  */
 +
 +static const gdb_byte *
 +arm_3ds_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size)
 +{
 +  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 +
 +  switch (kind)
 +    {
 +    case ARM_BP_KIND_ARM:
 +      *size = tdep->arm_breakpoint_size;
 +      return tdep->arm_breakpoint;
 +    case ARM_BP_KIND_THUMB:
 +      *size = tdep->thumb_breakpoint_size;
 +      return tdep->thumb_breakpoint;
 +    case ARM_BP_KIND_THUMB2:
 +      *size = tdep->thumb2_breakpoint_size;
 +      return tdep->thumb2_breakpoint;
 +    default:
 +      gdb_assert_not_reached ("unexpected arm breakpoint kind");
 +    }
 +}
 +
 +/* Implement the breakpoint_kind_from_current_state gdbarch method.  */
 +
 +static int
 +arm_3ds_breakpoint_kind_from_current_state (struct gdbarch *gdbarch,
 +					struct regcache *regcache,
 +					CORE_ADDR *pcptr)
 +{
 +  gdb_byte buf[4];
 +
 +  /* Check the memory pointed by PC is readable.  */
 +  if (target_read_memory (regcache_read_pc (regcache), buf, 4) == 0)
 +    {
 +      struct arm_get_next_pcs next_pcs_ctx;
 +
 +      arm_get_next_pcs_ctor (&next_pcs_ctx,
 +			     &arm_3ds_get_next_pcs_ops,
 +			     gdbarch_byte_order (gdbarch),
 +			     gdbarch_byte_order_for_code (gdbarch),
 +			     0,
 +			     regcache);
 +
 +      std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
 +
 +      /* If MEMADDR is the next instruction of current pc, do the
 +	 software single step computation, and get the thumb mode by
 +	 the destination address.  */
 +      for (CORE_ADDR pc : next_pcs)
 +	{
 +	  if (UNMAKE_THUMB_ADDR (pc) == *pcptr)
 +	    {
 +	      if (IS_THUMB_ADDR (pc))
 +		{
 +		  *pcptr = MAKE_THUMB_ADDR (*pcptr);
 +		  return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
 +		}
 +	      else
 +		return ARM_BP_KIND_ARM;
 +	    }
 +	}
 +    }
 +
 +  return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
 +}
 +
 +static void
 +arm_3ds_init_abi (struct gdbarch_info info,
 +			    struct gdbarch *gdbarch)
@@ -146,7 +296,13 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  tdep->fp_model = ARM_FLOAT_VFP;
 +
 +  /* Single stepping.  */
-+  set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
+  set_gdbarch_software_single_step (gdbarch, arm_3ds_software_single_step);
 +
 +  /* Breakpoint manipulation.  */
 +  set_gdbarch_breakpoint_kind_from_pc (gdbarch, arm_3ds_breakpoint_kind_from_pc);
 +  set_gdbarch_sw_breakpoint_from_kind (gdbarch, arm_3ds_sw_breakpoint_from_kind);
 +  set_gdbarch_breakpoint_kind_from_current_state (gdbarch,
 +						  arm_3ds_breakpoint_kind_from_current_state);
 +
 +  /* `catch syscall' */
 +  set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
@@ -159,10 +315,11 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
 +  gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
 +                          arm_3ds_init_abi);
 +}
-diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
+diff --git a/gdb/configure.tgt b/gdb/configure.tgt
--- gdb-8.2.1/gdb/configure.tgt	2018-12-23 05:51:54.000000000 +0000
+index f197160896..e2835ddef5 100644
-+++ gdb-8.2.1-apple/gdb/configure.tgt	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/configure.tgt
-@@ -61,7 +61,7 @@
+++ b/gdb/configure.tgt
@@ -61,7 +61,7 @@ arc*-*-*)
 	;;
 arm*-*-*)
@@ -171,10 +328,11 @@ diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
 hppa*-*-*)
 	# Target: HP PA-RISC
-diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-directory/Makefile.in
+diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
--- gdb-8.2.1/gdb/data-directory/Makefile.in	2018-01-05 04:07:23.000000000 +0000
+index 753e0b69a3..645eb043b9 100644
-+++ gdb-8.2.1-apple/gdb/data-directory/Makefile.in	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/data-directory/Makefile.in
-@@ -63,7 +63,7 @@
+++ b/gdb/data-directory/Makefile.in
@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
 	sparc-linux.xml \
 	sparc64-linux.xml
@@ -183,10 +341,11 @@ diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-di
 PYTHON_DIR = python
 PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
-diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
+diff --git a/gdb/defs.h b/gdb/defs.h
--- gdb-8.2.1/gdb/defs.h	2018-12-23 05:51:54.000000000 +0000
+index fc4217005a..a179a6d820 100644
-+++ gdb-8.2.1-apple/gdb/defs.h	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/defs.h
-@@ -495,6 +495,7 @@
+++ b/gdb/defs.h
@@ -495,6 +495,7 @@ enum gdb_osabi
   GDB_OSABI_LYNXOS178,
   GDB_OSABI_NEWLIB,
   GDB_OSABI_SDE,
@@ -194,10 +353,11 @@ diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
   GDB_OSABI_INVALID		/* keep this last */
 };
-diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
+diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
--- gdb-8.2.1/gdb/dtrace-probe.c	2018-12-23 05:51:54.000000000 +0000
+index fa4e06e794..b6afc4cc7c 100644
-+++ gdb-8.2.1-apple/gdb/dtrace-probe.c	2019-02-19 17:30:16.449175937 +0000
+--- a/gdb/dtrace-probe.c
-@@ -100,7 +100,7 @@
+++ b/gdb/dtrace-probe.c
@@ -100,7 +100,7 @@ public:
 /* DTrace static_probe_ops.  */
@@ -206,29 +366,11 @@ diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
 /* The following structure represents a dtrace probe.  */
-diff -NBaur gdb-8.2.1/gdb/Makefile.in gdb-8.2.1-apple/gdb/Makefile.in
+diff --git a/gdb/osabi.c b/gdb/osabi.c
--- gdb-8.2.1/gdb/Makefile.in	2018-12-23 05:51:54.000000000 +0000
+index 7d0540b181..49d3f78331 100644
-+++ gdb-8.2.1-apple/gdb/Makefile.in	2019-02-19 17:15:22.104618045 +0000
+--- a/gdb/osabi.c
-@@ -684,6 +684,7 @@
+++ b/gdb/osabi.c
- 	arch/arm-linux.o \
+@@ -80,6 +80,7 @@ static const struct osabi_names gdb_osabi_names[] =
 	arch/i386.o \
 	arch/ppc-linux-common.o \
 +	arm-3ds-tdep.o \
 	arm-bsd-tdep.o \
 	arm-fbsd-tdep.o \
 	arm-linux-tdep.o \
@@ -2213,6 +2214,7 @@
 	amd64-tdep.c \
 	arc-tdep.c \
 	arm.c \
 +	arm-3ds-tdep.c \
 	arm-bsd-tdep.c \
 	arm-fbsd-nat.c \
 	arm-fbsd-tdep.c \
 diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
 --- gdb-8.2.1/gdb/osabi.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/osabi.c	2019-02-19 17:15:22.104618045 +0000
@@ -80,6 +80,7 @@
   { "LynxOS178", NULL },
   { "Newlib", NULL },
   { "SDE", NULL },
@@ -236,10 +378,11 @@ diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
   { "<invalid>", NULL }
 };
-diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
+diff --git a/gdb/probe.c b/gdb/probe.c
--- gdb-8.2.1/gdb/probe.c	2018-12-23 05:51:54.000000000 +0000
+index 1f3da213ef..4acbeb8704 100644
-+++ gdb-8.2.1-apple/gdb/probe.c	2019-02-19 17:31:05.266578008 +0000
+--- a/gdb/probe.c
-@@ -60,7 +60,7 @@
+++ b/gdb/probe.c
@@ -60,7 +60,7 @@ public:
 /* Static operations associated with a generic probe.  */
@@ -248,10 +391,11 @@ diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
 /* A helper for parse_probes that decodes a probe specification in
    SEARCH_PSPACE.  It appends matching SALs to RESULT.  */
-diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
+diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
--- gdb-8.2.1/gdb/record-btrace.c	2018-12-23 05:51:54.000000000 +0000
+index 09a3f6cc5c..9f90a6b436 100644
-+++ gdb-8.2.1-apple/gdb/record-btrace.c	2019-02-19 17:31:33.301731324 +0000
+--- a/gdb/record-btrace.c
-@@ -144,7 +144,7 @@
+++ b/gdb/record-btrace.c
@@ -144,7 +144,7 @@ static record_btrace_target record_btrace_ops;
 /* Token associated with a new-thread observer enabling branch tracing
    for the new thread.  */
@@ -260,10 +404,11 @@ diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
 /* Memory access types used in set/show record btrace replay-memory-access.  */
 static const char replay_memory_access_read_only[] = "read-only";
-diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
+diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
--- gdb-8.2.1/gdb/stap-probe.c	2018-12-23 05:51:54.000000000 +0000
+index ed7e1a0d3f..42fad3835f 100644
-+++ gdb-8.2.1-apple/gdb/stap-probe.c	2019-02-19 17:29:35.744567941 +0000
+--- a/gdb/stap-probe.c
-@@ -119,7 +119,7 @@
+++ b/gdb/stap-probe.c
@@ -119,7 +119,7 @@ public:
 /* SystemTap static_probe_ops.  */
@@ -272,9 +417,11 @@ diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
 class stap_probe : public probe
 {
-diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml
+diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
--- gdb-8.2.1/gdb/syscalls/arm-3ds.xml	1970-01-01 01:00:00.000000000 +0100
+new file mode 100644
-+++ gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml	2019-02-19 17:15:22.104618045 +0000
+index 0000000000..48780b7bd5
 --- /dev/null
 +++ b/gdb/syscalls/arm-3ds.xml
@@ -0,0 +1,159 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
@@ -435,10 +582,11 @@ diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-
 +  <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
 +
 +</syscalls_info>
-diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
+diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
--- gdb-8.2.1/gdb/tui/tui-hooks.c	2018-12-23 05:51:54.000000000 +0000
+index efa02e2f08..1c341dcf47 100644
-+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c	2019-02-19 17:28:53.178460364 +0000
+--- a/gdb/tui/tui-hooks.c
-@@ -205,7 +205,7 @@
+++ b/gdb/tui/tui-hooks.c
@@ -205,7 +205,7 @@ tui_normal_stop (struct bpstats *bs, int print_frame)
 /* Token associated with observers registered while TUI hooks are
    installed.  */
--- a/dkarm-eabi/patches/newlib-3.1.0.patch
+++ b/dkarm-eabi/patches/newlib-3.1.0.patch
@@ -33,7 +33,7 @@ index 41843eed1..dc0e2a5fd 100644
 AS=${AS-as}
 diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
 new file mode 100644
-index 000000000..0d2be31c6
+index 000000000..7ee40deec
 --- /dev/null
 +++ b/libgloss/libsysbase/Makefile.in
@@ -0,0 +1,148 @@
@@ -104,7 +104,7 @@ index 000000000..0d2be31c6
 +	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
 +
 +# object files needed
-+OBJS = abort.o iosupport.o clocks.o close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
+OBJS = abort.o iosupport.o clocks.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
 +	isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
 +	unlink.o wait.o write.o _exit.o malloc_vars.o \
 +	chdir.o mkdir.o rename.o build_argv.o statvfs.o \
@@ -927,58 +927,6 @@ index 000000000..01cfee469
 +   }
 +}
 +
 diff --git a/libgloss/libsysbase/close.c b/libgloss/libsysbase/close.c
 new file mode 100644
 index 000000000..931ad07b1
 --- /dev/null
 +++ b/libgloss/libsysbase/close.c
@@ -0,0 +1,46 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
 +#include <stdio.h>
 +#include <errno.h>
 +
 +#include <sys/iosupport.h>
 +
 +#ifdef REENTRANT_SYSCALLS_PROVIDED
 +//---------------------------------------------------------------------------------
 +int _close_r(struct _reent *ptr, int fileDesc) {
 +//---------------------------------------------------------------------------------
 +#else
 +//---------------------------------------------------------------------------------
 +int _close(int fileDesc) {
 +//---------------------------------------------------------------------------------
 +	struct _reent *ptr = _REENT;
 +#endif
 +	int ret = -1;
 +	unsigned int dev = 0;
 +
 +	if(fileDesc!=-1) {
 +
 +		__handle *handle = __get_handle(fileDesc);
 +
 +		if ( handle != NULL) {
 +			dev = handle->device;
 +			handle->refcount--;
 +			if (handle->refcount == 0 ) {
 +
 +				if(devoptab_list[dev]->close_r) {
 +					ptr->deviceData = devoptab_list[dev]->deviceData;
 +					ret = devoptab_list[dev]->close_r(ptr,handle->fileStruct);
 +				}
 +				else
 +					ret = 0;
 +
 +				__release_handle(fileDesc);
 +			} else {
 +				ret = 0;
 +			}
 +
 +		}
 +	}
 +	return ret;
 +}
 diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
 new file mode 100644
 index 000000000..48ce950b4
@@ -1012,7 +960,7 @@ index 000000000..48ce950b4
 +#undef __SYMBOL_PREFIX
 diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
 new file mode 100644
-index 000000000..c4b5a79b6
+index 000000000..7fe331552
 --- /dev/null
 +++ b/libgloss/libsysbase/configure
@@ -0,0 +1,4158 @@
@@ -1599,7 +1547,7 @@ index 000000000..c4b5a79b6
 +PACKAGE_BUGREPORT=
 +PACKAGE_URL=
 +
-+ac_unique_file="close.c"
+ac_unique_file="abort.c"
 +ac_subst_vars='LTLIBOBJS
 +LIBOBJS
 +host_makefile_frag_path
@@ -5176,7 +5124,7 @@ index 000000000..c4b5a79b6
 +
 diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
 new file mode 100644
-index 000000000..bf276a413
+index 000000000..3da91ed98
 --- /dev/null
 +++ b/libgloss/libsysbase/configure.in
@@ -0,0 +1,199 @@
@@ -5195,7 +5143,7 @@ index 000000000..bf276a413
 +# Process this file with autoconf to produce a configure script.
 +#
 +AC_PREREQ(2.59)
-+AC_INIT(close.c)
+AC_INIT(abort.c)
 +AC_CONFIG_HEADER(config.h)
 +
 +if test "${enable_shared}" = "yes" ; then
@@ -6001,10 +5949,13 @@ index 000000000..9d5b74724
 +
 diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
 new file mode 100644
-index 000000000..f3fcc88f7
+index 000000000..6bf9ab89e
 --- /dev/null
 +++ b/libgloss/libsysbase/handle_manager.c
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,229 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
 +#include <stdlib.h>
 +#include <stdio.h>
 +#include <errno.h>
@@ -6025,7 +5976,7 @@ index 000000000..f3fcc88f7
 +
 +__LOCK_INIT(static, __hndl_lock);
 +
-+void __free_handle(__handle *handle) {
+static void __free_handle(__handle *handle) {
 +
 +	if ( NULL != handle
 +	&& handle != &__stdin_handle
@@ -6093,8 +6044,11 @@ index 000000000..f3fcc88f7
 +
 +	if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
 +
-+	return handles[fd];
+	__lock_acquire (__hndl_lock);
 +	__handle *handle = handles[fd];
 +	__lock_release (__hndl_lock);
 +
 +	return handle;
 +}
 +
 +int dup(int oldfd) {
@@ -6126,57 +6080,107 @@ index 000000000..f3fcc88f7
 +
 +int dup2(int oldfd, int newfd) {
 +
 +
 +	__lock_acquire (__hndl_lock);
 +
 +	if ( newfd < 0 || newfd >= MAX_HANDLES ||
 +		 oldfd < 0 || oldfd >= MAX_HANDLES) {
 +
 +		 oldfd < 0 || oldfd >= MAX_HANDLES ||
 +		 handles[oldfd] == NULL ) {
 +
 +		__lock_release (__hndl_lock);
 +		errno = EBADF;
 +
 +		return -1;
 +	}
 +
 +	if ( newfd == oldfd ) {
 +		__lock_release (__hndl_lock);
 +		return newfd;
 +	}
 +
 +	__lock_acquire (__hndl_lock);
 +
 +	if ( handles[oldfd] == NULL ) {
 +		__lock_release (__hndl_lock);
 +		errno = EBADF;
 +
 +		return -1;
 +	}
 +
 +	__handle *handle = handles[newfd];
 +
 +	if ( NULL != handle ) {
 +
 +		handle->refcount--;
 +
 +	}
 +
 +	handles[newfd] = handles[oldfd];
 +	handles[newfd]->refcount++;
 +
-+	__lock_release (__hndl_lock);
+	if ( handle ) {
 +
-+	if ( NULL != handle ) {
+		int ref = --handle->refcount;
 +		__lock_release (__hndl_lock);
 +
-+		if (handle->refcount == 0 ) {
+		if ( ref == 0 ) {
 +
-+			if( devoptab_list[handle->device]->close_r != NULL) {
+			if ( devoptab_list[handle->device]->close_r ) {
 +
 +				_REENT->deviceData = devoptab_list[handle->device]->deviceData;
 +				devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
 +
 +			} else {
 +
 +				__free_handle(handle);
 +
 +			}
 +
 +			__free_handle(handle);
 +		}
 +
 +	} else {
 +
 +		__lock_release (__hndl_lock);
 +
 +	}
 +
 +	return newfd;
 +}
 +
 +#ifdef REENTRANT_SYSCALLS_PROVIDED
 +//---------------------------------------------------------------------------------
 +int _close_r(struct _reent *ptr, int fd) {
 +//---------------------------------------------------------------------------------
 +#else
 +//---------------------------------------------------------------------------------
 +int _close(int fd) {
 +//---------------------------------------------------------------------------------
 +	struct _reent *ptr = _REENT;
 +#endif
 +	int ret = 0;
 +
 +	if (fd < 0 || fd >= MAX_HANDLES) {
 +
 +		ptr->_errno = EBADF;
 +		return -1;
 +
 +	}
 +
 +	__lock_acquire (__hndl_lock);
 +
 +	__handle *handle = handles[fd];
 +
 +	if ( !handle ) {
 +
 +		__lock_release (__hndl_lock);
 +		ptr->_errno = EBADF;
 +		return -1;
 +
 +	}
 +
 +	int ref = --handle->refcount;
 +	handles[fd] = NULL;
 +
 +	__lock_release (__hndl_lock);
 +
 +	if ( ref == 0 ) {
 +
 +		if ( devoptab_list[handle->device]->close_r ) {
 +
 +			ptr->deviceData = devoptab_list[handle->device]->deviceData;
 +			ret = devoptab_list[handle->device]->close_r(ptr,handle->fileStruct);
 +
 +		}
 +
 +		__free_handle(handle);
 +	}
 +
 +	return ret;
 +}
 diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
 new file mode 100644
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/dkarm-eabi/scripts/build-gcc.sh
@@ -64,7 +64,7 @@ then
 		--prefix=$prefix \
 		--enable-lto\
 		--with-system-zlib \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 51" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 53" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
--- a/dkarm-eabi/scripts/build-libs.sh
+++ b/dkarm-eabi/scripts/build-libs.sh
@@ -1,71 +0,0 @@
 #!/bin/sh
 #---------------------------------------------------------------------------------
 # set env variables
 #---------------------------------------------------------------------------------
 export DEVKITPRO=$TOOLPATH
 export DEVKITARM=$DEVKITPRO/devkitARM
 #---------------------------------------------------------------------------------
 # Install the rules files
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 mkdir -p rules
 cd rules
 tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
 make install
 #---------------------------------------------------------------------------------
 # Install and build the crt0 files
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 mkdir -p crtls
 cd crtls
 tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
 make install
 cd $BUILDDIR/libgba-$LIBGBA_VER
 $MAKE || { echo "error building libgba"; exit 1; }
 $MAKE install || { echo "error installing libgba"; exit 1; }
 cd $BUILDDIR/libnds-$LIBNDS_VER
 $MAKE || { echo "error building libnds"; exit 1; }
 $MAKE install || { echo "error installing libnds"; exit 1; }
 cd $BUILDDIR/dswifi-$DSWIFI_VER
 $MAKE || { echo "error building dswifi"; exit 1; }
 $MAKE install || { echo "error installing dswifi"; exit 1; }
 cd $BUILDDIR/maxmod-$MAXMOD_VER
 $MAKE || { echo "error building maxmod"; exit 1; }
 $MAKE install || { echo "error installing maxmod"; exit 1; }
 cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
 $MAKE || { echo "error building default arm7"; exit 1; }
 $MAKE install || { echo "error installing default arm7"; exit 1; }
 cd $BUILDDIR/libfat-$LIBFAT_VER
 $MAKE nds-install || { echo "error building nds libfat"; exit 1; }
 $MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
 #cd $BUILDDIR/libmirko-$LIBMIRKO_VER
 #$MAKE || { echo "error building libmirko"; exit 1; }
 #$MAKE install || { echo "error installing libmirko"; exit 1; }
 cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
 $MAKE || { echo "error building libfilesystem"; exit 1; }
 $MAKE install || { echo "error installing libfilesystem"; exit 1; }
 cd $BUILDDIR/libctru-$LIBCTRU_VER
 $MAKE || { echo "error building libctru"; exit 1; }
 $MAKE install || { echo "error installing libctru"; exit 1; }
 cd $BUILDDIR/citro3d-$CITRO3D_VER
 $MAKE || { echo "error building citro3d"; exit 1; }
 $MAKE install || { echo "error installing citro3d"; exit 1; }
 cd $BUILDDIR/citro2d-$CITRO2D_VER
 $MAKE || { echo "error building citro2d"; exit 1; }
 $MAKE install || { echo "error installing citro2d"; exit 1; }
--- a/dkppc/patches/gcc-8.3.0.patch
+++ b/dkppc/patches/gcc-8.3.0.patch
@@ -1,5 +1,5 @@
 diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..814104f32a2 100644
+index 7b29f1f..814104f 100644
 --- a/config/gthr.m4
 +++ b/config/gthr.m4
@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
@@ -11,10 +11,10 @@ index 7b29f1f3327..814104f32a2 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 532c33f4c2b..bb87330bbbe 100644
+index 7af8e02..dc58cab 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2461,7 +2461,7 @@ powerpc-xilinx-eabi*)
+@@ -2464,7 +2464,7 @@ powerpc-xilinx-eabi*)
 	use_gcc_stdint=wrap
 	;;
 powerpc-*-eabi*)
@@ -24,7 +24,7 @@ index 532c33f4c2b..bb87330bbbe 100644
 	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	use_gcc_stdint=wrap
 diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index f46e797d610..fd39e64c38d 100644
+index f46e797..fd39e64 100644
 --- a/gcc/config/newlib-stdint.h
 +++ b/gcc/config/newlib-stdint.h
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -37,7 +37,7 @@ index f46e797d610..fd39e64c38d 100644
 #define SIG_ATOMIC_TYPE "int"
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index b83b304e3eb..b85359edcfc 100644
+index b83b304..b85359e 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
@@ -212,6 +212,7 @@
@@ -57,8 +57,39 @@ index b83b304e3eb..b85359edcfc 100644
 #ifndef CC1_CPU_SPEC
 #ifdef HAVE_LOCAL_CPU_DETECT
 diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
 index 4d69c1d..af2d7b5 100644
 --- a/gcc/config/rs6000/rs6000.md
 +++ b/gcc/config/rs6000/rs6000.md
@@ -5625,19 +5625,19 @@
     tmp = gen_reg_rtx (DImode);
   emit_insn (gen_fctiwz_<mode> (tmp, src));
 -  if (MEM_P (dest))
 +  if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
     {
 -      dest = rs6000_address_for_fpconvert (dest);
 -      emit_insn (gen_stfiwx (dest, tmp));
 +      dest = gen_lowpart (DImode, dest);
 +      emit_move_insn (dest, tmp);
       DONE;
     }
 -  else if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
 +   else if (MEM_P (dest) && MEM_ALIGN (dest) >= 32)
     {
 -      dest = gen_lowpart (DImode, dest);
 -      emit_move_insn (dest, tmp);
 +      dest = rs6000_address_for_fpconvert (dest);
 +      emit_insn (gen_stfiwx (dest, tmp));
       DONE;
     }
 -  else
 +   else
     {
       rtx stack = rs6000_allocate_stack_temp (SImode, false, true);
       emit_insn (gen_stfiwx (stack, tmp));
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index bb19d0dcd41..74d1e474432 100644
+index bb19d0d..74d1e47 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
@@ -216,7 +247,7 @@ index bb19d0dcd41..74d1e474432 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 34fea0ddd08..084a8ae435e 100644
+index 34fea0d..084a8ae 100644
 --- a/gcc/config/rs6000/sysv4.opt
 +++ b/gcc/config/rs6000/sysv4.opt
@@ -124,6 +124,26 @@ mads
@@ -247,7 +278,7 @@ index 34fea0ddd08..084a8ae435e 100644
 Target RejectNegative
 Link with libyk.a, libc.a and crt0.o.
 diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..6584112e6a1 100755
+index 6121e16..6584112 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -11692,7 +11692,7 @@ case ${enable_threads} in
@@ -260,7 +291,7 @@ index 6121e163259..6584112e6a1 100755
     target_thread_file=${enable_threads}
     ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..c42b3ef5fc6 100644
+index b066cc6..c42b3ef 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -1611,7 +1611,7 @@ case ${enable_threads} in
@@ -273,7 +304,7 @@ index b066cc609e1..c42b3ef5fc6 100644
     target_thread_file=${enable_threads}
     ;;
 diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
-index ba2b2623301..8d866107142 100644
+index ba2b262..8d86610 100644
 --- a/libgcc/config/rs6000/crtrestvr.S
 +++ b/libgcc/config/rs6000/crtrestvr.S
@@ -24,7 +24,7 @@
@@ -291,7 +322,7 @@ index ba2b2623301..8d866107142 100644
 #endif
 +#endif
 diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
-index 077e33f34d5..b7be68b710f 100644
+index 077e33f..b7be68b 100644
 --- a/libgcc/config/rs6000/crtsavevr.S
 +++ b/libgcc/config/rs6000/crtsavevr.S
@@ -24,7 +24,7 @@
@@ -310,7 +341,7 @@ index 077e33f34d5..b7be68b710f 100644
 +#endif
 diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
 new file mode 100644
-index 00000000000..94d6ba94ec0
+index 0000000..94d6ba9
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.c
@@ -0,0 +1,349 @@
@@ -665,7 +696,7 @@ index 00000000000..94d6ba94ec0
 +}
 diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
 new file mode 100644
-index 00000000000..281c19d2a60
+index 0000000..281c19d
 --- /dev/null
 +++ b/libgcc/config/rs6000/gthr-dkp.h
@@ -0,0 +1,185 @@
@@ -855,7 +886,7 @@ index 00000000000..281c19d2a60
 +
 +#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
 diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
-index fb812d3801f..7f6669d530f 100644
+index fb812d3..7f6669d 100644
 --- a/libgcc/config/rs6000/t-ppccomm
 +++ b/libgcc/config/rs6000/t-ppccomm
@@ -1,4 +1,5 @@
@@ -865,7 +896,7 @@ index fb812d3801f..7f6669d530f 100644
 # This can't end up in shared libgcc
 diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..c6f93f8b3ac 100644
+index b2f3f87..c6f93f8 100644
 --- a/libgcc/configure
 +++ b/libgcc/configure
@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
@@ -877,7 +908,7 @@ index b2f3f870844..c6f93f8b3ac 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 5e894455e16..f2347455de0 100644
+index 5e89445..f234745 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -889,10 +920,10 @@ index 5e894455e16..f2347455de0 100644
 /* FIXME: Including auto-host is incorrect, but until we have
    identified the set of defines that need to go into auto-target.h,
 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index fbc9daeb195..90c15adda62 100755
+index 5535bfa..9f86d5d 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -15178,6 +15178,7 @@ $as_echo "$target_thread_file" >&6; }
+@@ -15180,6 +15180,7 @@ $as_echo "$target_thread_file" >&6; }
 case $target_thread_file in
     aix)	thread_header=config/rs6000/gthr-aix.h ;;
--- a/dkppc/patches/gdb-8.2.1.patch
+++ b/dkppc/patches/gdb-8.2.1.patch
@@ -0,0 +1,60 @@
 diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
 --- gdb-8.2.1/gdb/dtrace-probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/dtrace-probe.c	2019-02-19 17:30:16.449175937 +0000
@@ -100,7 +100,7 @@
 /* DTrace static_probe_ops.  */
 -const dtrace_static_probe_ops dtrace_static_probe_ops;
 +const dtrace_static_probe_ops dtrace_static_probe_ops = {};
 /* The following structure represents a dtrace probe.  */
 diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
 --- gdb-8.2.1/gdb/probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/probe.c	2019-02-19 17:31:05.266578008 +0000
@@ -60,7 +60,7 @@
 /* Static operations associated with a generic probe.  */
 -const any_static_probe_ops any_static_probe_ops;
 +const any_static_probe_ops any_static_probe_ops = {};
 /* A helper for parse_probes that decodes a probe specification in
    SEARCH_PSPACE.  It appends matching SALs to RESULT.  */
 diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
 --- gdb-8.2.1/gdb/record-btrace.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/record-btrace.c	2019-02-19 17:31:33.301731324 +0000
@@ -144,7 +144,7 @@
 /* Token associated with a new-thread observer enabling branch tracing
    for the new thread.  */
 -static const gdb::observers::token record_btrace_thread_observer_token;
 +static const gdb::observers::token record_btrace_thread_observer_token = {};
 /* Memory access types used in set/show record btrace replay-memory-access.  */
 static const char replay_memory_access_read_only[] = "read-only";
 diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
 --- gdb-8.2.1/gdb/stap-probe.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/stap-probe.c	2019-02-19 17:29:35.744567941 +0000
@@ -119,7 +119,7 @@
 /* SystemTap static_probe_ops.  */
 -const stap_static_probe_ops stap_static_probe_ops;
 +const stap_static_probe_ops stap_static_probe_ops = {};
 class stap_probe : public probe
 {
 diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
 --- gdb-8.2.1/gdb/tui/tui-hooks.c	2018-12-23 05:51:54.000000000 +0000
 +++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c	2019-02-19 17:28:53.178460364 +0000
@@ -205,7 +205,7 @@
 /* Token associated with observers registered while TUI hooks are
    installed.  */
 -static const gdb::observers::token tui_observers_token;
 +static const gdb::observers::token tui_observers_token = {};
 /* Attach or detach a single observer, according to ATTACH.  */
--- a/dkppc/patches/newlib-3.1.0.patch
+++ b/dkppc/patches/newlib-3.1.0.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index aa6f8f834..0e8579890 100755
+index 1a4033dce..ba7aea7b0 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2594,6 +2594,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
 fi
@@ -12,7 +12,7 @@ index aa6f8f834..0e8579890 100755
 ac_config_commands="$ac_config_commands depfiles"
 diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 6da164352..0375cabbc 100644
+index 41843eed1..689e8b3ad 100644
 --- a/libgloss/configure.in
 +++ b/libgloss/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
@@ -33,7 +33,7 @@ index 6da164352..0375cabbc 100644
 case "${target}" in
   aarch64*-*-*)
 	AC_CONFIG_SUBDIRS(aarch64)
-@@ -188,6 +192,10 @@ if test "${config_libnosys}" = "true"; then
+@@ -191,6 +195,10 @@ if test "${config_libnosys}" = "true"; then
   AC_CONFIG_SUBDIRS([libnosys])
 fi
@@ -7389,10 +7389,10 @@ index 000000000..bd25d775d
 +	exit ( main(__system_argv->argc,__system_argv->argv) );
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index eb645868b..b9a006453 100644
+index 6c49cb750..f30edc1a3 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -797,7 +797,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -832,7 +832,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
 	;;
@@ -7470,7 +7470,7 @@ index a3fb5c02c..adb8e1083 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index 2900b332f..6efb54eb3 100644
+index f28dd071b..96980676d 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
@@ -330,6 +330,9 @@ extern "C" {
@@ -7598,7 +7598,7 @@ index 000000000..8b6d8da30
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 1ef226194..ce3721a14 100644
+index 6e55e1c1f..6e0c1c9cf 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
@@ -416,6 +416,8 @@ struct _reent
@@ -7609,8 +7609,8 @@ index 1ef226194..ce3721a14 100644
 +  void *deviceData;
 };
- extern const struct __sFILE_fake __sf_fake_stdin;
+ #ifdef _REENT_GLOBAL_STDIO_STREAMS
-@@ -647,6 +649,7 @@ struct _reent
+@@ -686,6 +688,7 @@ struct _reent
 # ifndef _REENT_GLOBAL_STDIO_STREAMS
   __FILE __sf[3];  		/* first three file descriptors */
 # endif
@@ -7721,10 +7721,10 @@ index 5e937f103..635a7a6b8 100644
 };
 #endif
 diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
-index baa5451a6..236746f54 100644
+index 4c343e462..835b3a712 100644
 --- a/newlib/libc/locale/locale.c
 +++ b/newlib/libc/locale/locale.c
-@@ -165,15 +165,18 @@ No supporting OS subroutines are required.
+@@ -166,15 +166,18 @@ No supporting OS subroutines are required.
 #include "../ctype/ctype_.h"
 #include "../stdlib/local.h"
@@ -7743,7 +7743,7 @@ index baa5451a6..236746f54 100644
 #ifdef _MB_CAPABLE
 /*
  * Category names for getenv()
-@@ -193,7 +196,11 @@ static char *categories[_LC_LAST] = {
+@@ -194,7 +197,11 @@ static char *categories[_LC_LAST] = {
  * Default locale per POSIX.  Can be overridden on a per-target base.
  */
 #ifndef DEFAULT_LOCALE
@@ -7756,7 +7756,7 @@ index baa5451a6..236746f54 100644
 #endif
 #ifdef _MB_CAPABLE
-@@ -206,8 +213,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
+@@ -207,8 +214,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
 const struct __locale_t __C_locale =
 {
   { "C", "C", "C", "C", "C", "C", "C", },
@@ -7770,7 +7770,7 @@ index baa5451a6..236746f54 100644
   0,
   DEFAULT_CTYPE_PTR,
   {
-@@ -218,9 +230,15 @@ const struct __locale_t __C_locale =
+@@ -219,9 +231,15 @@ const struct __locale_t __C_locale =
     CHAR_MAX, CHAR_MAX
   },
 #ifndef __HAVE_LOCALE_INFO__
@@ -7786,7 +7786,7 @@ index baa5451a6..236746f54 100644
 #else /* __HAVE_LOCALE_INFO__ */
   {
     { NULL, NULL },			/* LC_ALL */
-@@ -239,10 +257,11 @@ const struct __locale_t __C_locale =
+@@ -240,10 +258,11 @@ const struct __locale_t __C_locale =
 };
 #endif /* _MB_CAPABLE */
@@ -7799,7 +7799,7 @@ index baa5451a6..236746f54 100644
   __utf8_wctomb,
   __utf8_mbtowc,
 #else
-@@ -259,9 +278,15 @@ struct __locale_t __global_locale =
+@@ -260,9 +279,15 @@ struct __locale_t __global_locale =
     CHAR_MAX, CHAR_MAX
   },
 #ifndef __HAVE_LOCALE_INFO__
@@ -7815,7 +7815,7 @@ index baa5451a6..236746f54 100644
 #else /* __HAVE_LOCALE_INFO__ */
   {
     { NULL, NULL },			/* LC_ALL */
-@@ -982,6 +1007,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
+@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
 const char *
 __locale_ctype_ptr (void)
@@ -7823,6 +7823,34 @@ index baa5451a6..236746f54 100644
 {
   return __get_current_locale ()->ctype_ptr;
 }
 diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h
 index a0c80843a..efabdcfc4 100644
 --- a/newlib/libc/locale/setlocale.h
 +++ b/newlib/libc/locale/setlocale.h
@@ -217,11 +217,7 @@ __get_global_locale ()
 _ELIDABLE_INLINE struct __locale_t *
 __get_locale_r (struct _reent *r)
 {
 -#ifdef __HAVE_LOCALE_INFO__
   return r->_locale;
 -#else
 -  return __get_global_locale();
 -#endif
 }
 /* In POSIX terms the current locale is the locale used by all functions
@@ -231,11 +227,7 @@ __get_locale_r (struct _reent *r)
 _ELIDABLE_INLINE struct __locale_t *
 __get_current_locale (void)
 {
 -#ifdef __HAVE_LOCALE_INFO__
   return _REENT->_locale ?: __get_global_locale ();
 -#else
 -  return __get_global_locale();
 -#endif
 }
 /* Only access fixed "C" locale using this function.  Fake for !_MB_CAPABLE
 diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
 index e86afdf1c..007bd1567 100644
 --- a/newlib/libc/machine/powerpc/Makefile.am
@@ -8024,10 +8052,10 @@ index 000000000..04ebd1ee0
 +#endif /* _NEWLIB_STDIO_H */
 +
 diff --git a/newlib/libc/misc/init.c b/newlib/libc/misc/init.c
-index c85d6020f..1beb783b8 100644
+index 95f1a7422..c797d2e64 100644
 --- a/newlib/libc/misc/init.c
 +++ b/newlib/libc/misc/init.c
-@@ -40,4 +40,8 @@ __libc_init_array (void)
+@@ -44,4 +44,8 @@ __libc_init_array (void)
   for (i = 0; i < count; i++)
     __init_array_start[i] ();
 }
--- a/dkppc/scripts/build-gcc.sh
+++ b/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 34" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 35" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
        CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
--- a/dkppc/scripts/build-libs.sh
+++ b/dkppc/scripts/build-libs.sh
@@ -1,27 +0,0 @@
 #!/bin/bash
 export DEVKITPPC=$TOOLPATH/devkitPPC
 export DEVKITPRO=$TOOLPATH
 cd $BUILDDIR
 mkdir -p rules
 cd rules
 tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
 make install
 cd $BUILDDIR/libogc-$LIBOGC_VER
 if [ ! -f installed ]; then
 	echo "Building & installing libogc"
 	$MAKE install || { echo "libogc install failed"; exit 1; }
 	touch installed
 fi
 cd $BUILDDIR/libfat-$LIBFAT_VER
 if [ ! -f installed ]; then
 	echo "Building & installing libfat"
 	$MAKE ogc-install || { echo "libfat install failed"; exit 1; }
 	touch installed
 fi
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -17,8 +17,8 @@ do
  echo
  echo "Please select the toolchain you require"
  echo
-  echo "1: devkitARM (gba gp32 ds)"
+  echo "1: devkitARM (gba gp32 ds 3ds)"
-  echo "2: devkitPPC (gamecube wii)"
+  echo "2: devkitPPC (gamecube wii wii-u)"
  echo "3: devkitA64 (switch)"
  read VERSION
@@ -30,7 +30,7 @@ done
 case "$VERSION" in
  "1" )
-    GCC_VER=8.2.0
+    GCC_VER=9.1.0
    BINUTILS_VER=2.32
    NEWLIB_VER=3.1.0
    GDB_VER=8.2.1
@@ -40,21 +40,21 @@ case "$VERSION" in
    toolchain=DEVKITARM
  ;;
  "2" )
-    GCC_VER=8.2.0
+    GCC_VER=8.3.0
    BINUTILS_VER=2.32
    MN_BINUTILS_VER=2.17
-    NEWLIB_VER=3.0.0
+    NEWLIB_VER=3.1.0
-    GDB_VER=8.2
+    GDB_VER=8.2.1
    basedir='dkppc'
    package=devkitPPC
    target=powerpc-eabi
    toolchain=DEVKITPPC
  ;;
  "3" )
-    GCC_VER=8.2.0
+    GCC_VER=8.3.0
-    BINUTILS_VER=2.31.1
+    BINUTILS_VER=2.32
-    NEWLIB_VER=3.0.0
+    NEWLIB_VER=3.1.0
-    GDB_VER=8.0
+    GDB_VER=8.2.1
    basedir='dka64'
    package=devkitA64
    target=aarch64-none-elf
Author	SHA1	Message	Date
Dave Murphy	736db33e06	devkitARM: remove old gcc patch	2019-06-28 16:07:20 +01:00
Dave Murphy	96f7acc919	remove library building from scripts	2019-06-25 22:04:51 +01:00
Dave Murphy	c2aae79d59	devkitARM: latest newlib patch	2019-06-25 20:28:26 +01:00
Dave Murphy	fe202a6f50	devkitARM: update gcc to 9.1.0	2019-06-23 10:54:29 +01:00
Dave Murphy	aeb6482da9	devkitARM: update gdb patch	2019-05-14 10:22:19 +01:00
Dave Murphy	b1d5f5c7a6	fix macOS build	2019-03-29 20:17:09 +00:00
fincs	1974c8ae38	Update devkitA64 newlib patch, remove old stale patch	2019-03-29 20:17:09 +00:00
fincs	65c1a1256a	devkitA64: update binutils patch with latest changes	2019-03-29 20:17:09 +00:00
Dave Murphy	ade65bab03	fix uselocal	2019-03-29 20:17:09 +00:00
Dave Murphy	bcb3bff114	update devkitA64 version	2019-03-29 20:17:09 +00:00
Dave Murphy	a48e515bd6	devkitA64: update newlib to 3.1.0	2019-03-29 20:16:16 +00:00
Dave Murphy	fec37937b7	devkitA64: update gdb to 8.2.1	2019-03-29 20:16:16 +00:00
Dave Murphy	2c8ae62e8e	devkitA64: update gcc to 8.3.0	2019-03-29 20:16:16 +00:00
Dave Murphy	383ebe76c8	devkitA64: update binutils to 2.32	2019-03-29 20:16:16 +00:00
Dave Murphy	d604cafce3	devkitPPC: update gdb to 8.2.1	2019-03-19 11:53:46 +00:00
Dave Murphy	d0d158bd80	devkitPPC: update newlib to 3.1.0	2019-03-19 11:53:46 +00:00
Dave Murphy	fe39e87d88	devkitPPC: update gcc to 8.3.0	2019-03-19 11:53:46 +00:00
Dave Murphy	5ddee95920	add latest consoles to lists	2019-03-15 02:22:29 +00:00
Dave Murphy	58b9db7650	devkitARM: update to gcc 8.3.0	2019-03-15 02:22:29 +00:00
Eix	43415d430a	there was an extra unneeded space, it was bothering me	2019-03-13 09:22:21 +00:00