devkitPPC: release 47

The patches we use do not apply with BSD Patch. Attempt to find GNU
Patch and use that instead of the default 'patch' program. The patches
appear to apply fine as no errors are returned when we run patch.
However, files like libsysbase/dummy.c aren't created and we see the
following error:

    gmake[2]: Entering directory '.devkitARM/arm-none-eabi/newlib/arm-none-eabi/libgloss' /usr/local/bin/gmake  all-recursive
    gmake[3]: Entering directory '.devkitARM/arm-none-eabi/newlib/arm-none-eabi/libgloss'
    Making all in .
    gmake[4]: Entering directory '.devkitARM/arm-none-eabi/newlib/arm-none-eabi/libgloss'
      MAKEINFO ../../../../newlib-4.4.0.20231231/libgloss/doc/porting.info
      gmake[4]: *** No rule to make target 'libsysbase/dummy.c', needed by 'libsysbase/dummy.o'.  Stop.

By switching to GNU Patch, our patches properly apply and the build
succeeds.

.gitignore

@@ -2,6 +2,7 @@ config.sh
 .devkitARM*
 .devkitPPC*
 .devkitA64*
+*.xz
 *.gz
 *.bz2
 *~

README.TXT

@@ -24,9 +24,9 @@ For building gcc libgmp, libmpfr and libmpc are required - these are built as
 static libraries to make packaging simpler. If you're building the tools for
 personal use then the versions packaged by your chosen distro should suffice.
 
-http://gmplib.org/
+https://gmplib.org/
-http://www.mpfr.org/
+https://www.mpfr.org/
-http://www.multiprecision.org/
+https://www.multiprecision.org/
 
 sudo apt-get install libgmp-dev libmpfr-dev libmpc-dev
 
@@ -34,10 +34,10 @@ Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib,
 expat, and libusb. Again these are built as static libraries for ease of
 packaging but you can probably use the versions supplied by your distro.
 
-http://freeimage.sourceforge.net/
+https://freeimage.sourceforge.net/
-http://www.zlib.net
+https://www.zlib.net
-http://www.libusb.org
+https://www.libusb.org
-http://expat.sourceforge.net/
+https://expat.sourceforge.net/
 
 sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
 

build-devkit.sh

@@ -1,9 +1,8 @@
-
+#!/usr/bin/env bash
-#!/bin/bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 54
+#	devkitARM release 66
-#	devkitPPC release 36
+#	devkitPPC release 47
-#	devkitA64 release 15
+#	devkitA64 release 27
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -28,13 +27,27 @@ echo
 
 
 
-DKARM_RULES_VER=1.0.0
+DKARM_RULES_VER=1.6.1
-DKARM_CRTLS_VER=1.0.0
+DKARM_CRTLS_VER=1.2.7
 
-DKPPC_RULES_VER=1.0.0
+DKPPC_RULES_VER=1.2.1
+
+DKA64_RULES_VER=1.1.1
 
 OSXMIN=${OSXMIN:-10.9}
 
+#---------------------------------------------------------------------------------
+# find proper patch
+#---------------------------------------------------------------------------------
+if [ -z "$PATCH" -a -x "$(which gpatch)" ]; then PATCH=$(which gpatch); fi
+if [ -z "$PATCH" -a -x "$(which patch)" ]; then PATCH=$(which patch); fi
+if [ -z "$PATCH" ]; then
+  echo no patch found
+  exit 1
+fi
+echo use $PATCH as patch
+export PATCH
+
 #---------------------------------------------------------------------------------
 function extract_and_patch {
 #---------------------------------------------------------------------------------
@@ -45,7 +58,7 @@ function extract_and_patch {
 	fi
 	if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2.patch ]]; then
 		echo "patching $1-$2"
-		patch -p1 -d $1-$2 -i $patchdir/$1-$2.patch || { echo "Error patching $1"; exit 1; }
+		$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2.patch || { echo "Error patching $1"; exit 1; }
 		touch patched-$1-$2
 	fi
 }
@@ -57,13 +70,6 @@ if [ ! -z "$CROSSBUILD" ] ; then
 	fi
 fi
 
-#---------------------------------------------------------------------------------
-# Sane defaults for building toolchain
-#---------------------------------------------------------------------------------
-export CFLAGS="-O2 -pipe"
-export CXXFLAGS="$CFLAGS"
-unset LDFLAGS
-
 #---------------------------------------------------------------------------------
 # Look for automated configuration file to bypass prompts
 #---------------------------------------------------------------------------------
@@ -78,20 +84,18 @@ fi
 . ./select_toolchain.sh
 
 #---------------------------------------------------------------------------------
-# Get preferred installation directory and set paths to the sources
+# Legacy versions of these scripts allowed the selection of a prefix which is
+# no longer supported. Since adopting pacman and providing precompiled binaries
+# of "portlibs" everything we distribute is intended to work within opt/devkitpro
+#
+# Rather than attempting to repackage our work for exotic linux distributions it
+# would be much better for everyone concerned if efforts were made to provide
+# pacman and whatever support is necessary to allow the binaries we distribute to
+# work as expected.
+#
+# See https://github.com/devkitPro/pacman and https://devkitpro.org/wiki/devkitPro_pacman
 #---------------------------------------------------------------------------------
-
+INSTALLDIR=/opt/devkitpro
-if [ ! -z "$BUILD_DKPRO_INSTALLDIR" ] ; then
-	INSTALLDIR="$BUILD_DKPRO_INSTALLDIR"
-else
-	echo
-	echo "Please enter the directory where you would like '$package' to be installed:"
-	echo "for mingw/msys you must use <drive>:/<install path> or you will have include path problems"
-	echo "this is the top level directory for devkitpro, i.e. e:/devkitPro"
-
-	read -e INSTALLDIR
-	echo
-fi
 
 [ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1;
 
@@ -118,24 +122,22 @@ fi
 echo use $MAKE as make
 export MAKE
 
+CROSS_PARAMS="--build=`./config.guess`"
+
+if [ ! -z $CROSSBUILD ]; then
+	export PATH=/opt/devkitpro/$package/bin:$PATH
+	prefix=$INSTALLDIR/$CROSSBUILD/$package
+	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
+	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH --with-isl=$CROSSPATH --with-zstd=$CROSSPATH"
+else
+	prefix=$INSTALLDIR/$package
+fi
+
 #---------------------------------------------------------------------------------
 # Add installed devkit to the path, adjusting path on minsys
 #---------------------------------------------------------------------------------
 TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
-export PATH=$PATH:$TOOLPATH/$package/bin
+export PATH=$TOOLPATH/$package/bin:$PATH
-
-CROSS_PARAMS="--build=`./config.guess`"
-
-if [ ! -z $CROSSBUILD ]; then
-	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
-	prefix=$INSTALLDIR/$CROSSBUILD/$package
-	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
-	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
-	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
-else
-	toolsprefix=$INSTALLDIR/tools
-	prefix=$INSTALLDIR/$package
-fi
 
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
 
@@ -162,7 +164,7 @@ case $PLATFORM in
 		fi
     ;;
 	MINGW32* )
-		cppflags="-D__USE_MINGW_ACCESS"
+		cppflags="-D__USE_MINGW_ACCESS -D__USE_MINGW_ANSI_STDIO=1"
     ;;
 esac
 
@@ -181,19 +183,25 @@ fi
 patchdir=$(pwd)/$basedir/patches
 scriptdir=$(pwd)/$basedir/scripts
 
-archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
+archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz"
-
-if [ $VERSION -eq 1 ]; then
-
-	archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
-fi
 
 if [ $VERSION -eq 2 ]; then
-
+	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
-	archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
 fi
 
+if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
+	if [ $VERSION -eq 1 ]; then
+		archives="devkitarm-rules-$DKARM_RULES_VER.tar.gz devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz $archives"
+	fi
 
+	if [ $VERSION -eq 2 ]; then
+		archives="devkitppc-rules-$DKPPC_RULES_VER.tar.gz $archives"
+	fi
+
+	if [ $VERSION -eq 3 ]; then
+		archives="devkita64-rules-$DKA64_RULES_VER.tar.gz $archives"
+	fi
+fi
 
 if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
 	SRCDIR="$BUILD_DKPRO_SRCDIR"
@@ -217,7 +225,6 @@ cd $BUILDDIR
 extract_and_patch binutils $BINUTILS_VER xz
 extract_and_patch gcc $GCC_VER xz
 extract_and_patch newlib $NEWLIB_VER gz
-extract_and_patch gdb $GDB_VER xz
 
 if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
 
@@ -233,14 +240,11 @@ fi
 
 cd $BUILDSCRIPTDIR
 
-if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
+if [ "$BUILD_DKPRO_NO_STRIP_BINARIES" != "1" ]; then
-	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/bin/
+	echo "stripping installed binaries"
-	cp -v	$CROSSBINPATH/libwinpthread-1.dll $prefix/libexec/gcc/$target/$GCC_VER/
+	. ./strip_bins.sh
 fi
 
-echo "stripping installed binaries"
-. ./strip_bins.sh
-
 #---------------------------------------------------------------------------------
 # Clean up temporary files and source directories
 #---------------------------------------------------------------------------------

config.sh.sample

@@ -13,12 +13,6 @@
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_PACKAGE=0
 
-#---------------------------------------------------------------------------------
-# Toolchain installation directory, comment if not specified
-#---------------------------------------------------------------------------------
-#BUILD_DKPRO_INSTALLDIR=/opt/devkitpro
-#BUILD_DKPRO_INSTALLDIR=c:/devkitPro
-
 #---------------------------------------------------------------------------------
 # Path to previously downloaded source packages, comment if not specified
 #---------------------------------------------------------------------------------
@@ -31,9 +25,9 @@ BUILD_DKPRO_PACKAGE=0
 #export MAKEFLAGS="$MAKEFLAGS -j${numcores}"
 
 #---------------------------------------------------------------------------------
-# Uncomment to skip building of tools
+# Uncomment to skip building of crtls and rules files
 #---------------------------------------------------------------------------------
-#BUILD_DKPRO_SKIP_TOOLS=1
+#BUILD_DKPRO_SKIP_CRTLS=1
 
 # Automated script execution
 #---------------------------------------------------------------------------------

cross-build-i686-w64-mingw32.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-export CROSSBUILD=i686-w64-mingw32
-export CROSSPATH=/opt/mingw32/mingw
-export CROSSLIBPATH=$CROSSPATH/lib
-export CROSSBINPATH=$CROSSPATH/bin
-export PATH=/opt/mingw32/bin:$PATH
-

cross-build-x86_64-apple-darwin15.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export CPPFLAGS=-I/opt/osx/x86_64-apple-darwin15/include
-export LDFLAGS=-L/opt/osx/x86_64-apple-darwin15/lib
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-
-export CC=x86_64-apple-darwin15-clang
-export CXX=x86_64-apple-darwin15-clang++
-
-export CROSSBUILD=x86_64-apple-darwin15
-export CROSSPATH=/opt/osx/x86_64-apple-darwin15
-export CROSSLIBPATH=$CROSSPATH/lib
-export CROSSBINPATH=$CROSSPATH/bin
-export PATH=/opt/osx/bin:$PATH
-export PKG_CONFIG_PATH=
-export PKG_CONFIG_LIBDIR=$CROSSLIBPATH/pkgconfig
-

cross-build-x86_64-w64-mingw32.sh

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

dka64/patches/binutils-2.43.1.patch

@@ -1,15 +1,15 @@
 diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
-index 5741c60264..fb5d9d069c 100644
+index b89d3dda05d..1ad8a9c088d 100644
 --- a/bfd/elf-bfd.h
 +++ b/bfd/elf-bfd.h
-@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
+@@ -2005,6 +2005,14 @@ struct output_elf_obj_tdata
      asection *sec;
-   } build_id;
+   } package_metadata;
  
 +  /* Data for .nx-module-name. */
 +  struct
 +  {
-+    bfd_boolean (*after_write_object_contents) (bfd *);
++    bool (*after_write_object_contents) (bfd *);
 +    const char *name;
 +    asection *sec;
 +  } nx_module_name;
@@ -18,29 +18,29 @@ index 5741c60264..fb5d9d069c 100644
    bfd_size_type program_header_size;
  
 diff --git a/bfd/elf.c b/bfd/elf.c
-index eb3e1828e9..bc6bb48804 100644
+index f85f79e1e35..d27f05b92ae 100644
 --- a/bfd/elf.c
 +++ b/bfd/elf.c
-@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
+@@ -7166,6 +7166,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
    if (!bed->s->write_shdrs_and_ehdr (abfd))
-     return FALSE;
+     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;
++        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)
+   if (t->o->build_id.after_write_object_contents != NULL
-     return (*t->o->build_id.after_write_object_contents) (abfd);
+       && !(*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
+index 94c9a01069b..d39880b27c4 100644
 --- a/bfd/elfnn-aarch64.c
 +++ b/bfd/elfnn-aarch64.c
-@@ -2341,6 +2341,12 @@ enum elf_aarch64_stub_type
+@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
    aarch64_stub_erratum_843419_veneer,
  };
  
@@ -53,7 +53,7 @@ index faa27611d4..888af6bcd8 100644
  struct elf_aarch64_stub_hash_entry
  {
    /* Base hash table entry structure.  */
-@@ -6436,11 +6442,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+@@ -6969,11 +6975,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
        Elf_Internal_Sym *sym;
        asection *sec;
        struct elf_link_hash_entry *h;
@@ -62,12 +62,12 @@ index faa27611d4..888af6bcd8 100644
        bfd_reloc_status_type r;
        arelent bfd_reloc;
        char sym_type;
-       bfd_boolean unresolved_reloc = FALSE;
+       bool unresolved_reloc = false;
-+      bfd_boolean resolved_to_zero = FALSE;
++      bool 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,
+@@ -7113,6 +7121,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
  					       h, &unresolved_reloc,
  					       save_addend, &addend, sym);
  
@@ -78,7 +78,7 @@ index faa27611d4..888af6bcd8 100644
        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,
+@@ -7136,7 +7148,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
  	      need_relocs =
  		(!bfd_link_executable (info) || indx != 0) &&
  		(h == NULL
@@ -87,7 +87,7 @@ index faa27611d4..888af6bcd8 100644
  		 || h->root.type != bfd_link_hash_undefweak);
  
  	      BFD_ASSERT (globals->root.srelgot != NULL);
-@@ -6694,7 +6706,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+@@ -7231,7 +7243,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
  	      need_relocs =
  		(!bfd_link_executable (info) || indx != 0) &&
  		(h == NULL
@@ -96,7 +96,7 @@ index faa27611d4..888af6bcd8 100644
  		 || h->root.type != bfd_link_hash_undefweak);
  
  	      BFD_ASSERT (globals->root.srelgot != NULL);
-@@ -6743,7 +6755,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+@@ -7280,7 +7292,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
  	      bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
  
  	      need_relocs = (h == NULL
@@ -105,17 +105,14 @@ index faa27611d4..888af6bcd8 100644
  			     || 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)
+@@ -7606,6 +7618,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
-   return FALSE;
+   return false;
  }
  
 +/* Remove undefined weak symbol from the dynamic symbol table if it
 +   is resolved to 0.   */
 +
-+extern bfd_boolean
++static bool
-+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)
 +{
@@ -126,21 +123,21 @@ index faa27611d4..888af6bcd8 100644
 +      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
 +                              h->dynstr_index);
 +    }
-+  return TRUE;
++  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)
+@@ -8824,6 +8853,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;
++  bool 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)
+@@ -8843,6 +8873,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);
  
@@ -151,7 +148,7 @@ index faa27611d4..888af6bcd8 100644
    /* 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)
+@@ -8852,7 +8886,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.  */
@@ -160,9 +157,9 @@ index faa27611d4..888af6bcd8 100644
  	  && 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)
+@@ -8886,6 +8920,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;
+ 	  s->size += htab->plt_entry_size;
  
 +          /* There should be no PLT relocations against resolved undefined
 +             weak symbols in the executable.  */
@@ -172,15 +169,15 @@ index faa27611d4..888af6bcd8 100644
  	  /* 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)
+@@ -8914,6 +8953,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	    htab->variant_pcs = 1;
  
- 	  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)
+@@ -8926,9 +8966,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
        h->needs_plt = 0;
      }
  
@@ -189,8 +186,8 @@ index faa27611d4..888af6bcd8 100644
 -
    if (h->got.refcount > 0)
      {
-       bfd_boolean dyn;
+       bool dyn;
-@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+@@ -8940,7 +8977,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.  */
@@ -199,7 +196,7 @@ index faa27611d4..888af6bcd8 100644
  	  && 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)
+@@ -8954,7 +8991,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;
@@ -208,7 +205,7 @@ index faa27611d4..888af6bcd8 100644
  	       || 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)
+@@ -8990,7 +9027,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
  	    }
  
  	  indx = h && h->dynindx != -1 ? h->dynindx : 0;
@@ -217,16 +214,16 @@ index faa27611d4..888af6bcd8 100644
  	       || 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)
+@@ -9072,7 +9109,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 (h->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;
+ 	    h->dyn_relocs = NULL;
  
-@@ -8532,7 +8572,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+@@ -9092,7 +9129,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.  */
  
@@ -237,20 +234,20 @@ index faa27611d4..888af6bcd8 100644
  	  && ((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)
+@@ -9103,6 +9142,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;
+ 	    return false;
-@@ -9163,8 +9206,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+@@ -10058,8 +10098,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;
++  bool local_undefweak;
    htab = elf_aarch64_hash_table (info);
  
 +  eh = (struct elf_aarch64_link_hash_entry *) h;
@@ -263,8 +260,8 @@ index faa27611d4..888af6bcd8 100644
    if (h->plt.offset != (bfd_vma) - 1)
      {
        asection *plt, *gotplt, *relplt;
-@@ -9199,7 +9251,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+@@ -10094,7 +10143,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
- 	return FALSE;
+ 	abort ();
  
        elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
 -      if (!h->def_regular)
@@ -272,12 +269,8 @@ index faa27611d4..888af6bcd8 100644
  	{
  	  /* 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,
+@@ -10116,7 +10165,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
-     }
+       && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
- 
-   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))
@@ -286,7 +279,7 @@ index faa27611d4..888af6bcd8 100644
      {
        Elf_Internal_Rela rela;
        bfd_byte *loc;
-@@ -9715,6 +9768,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
+@@ -10766,6 +10816,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
  #define elf_backend_init_index_section		\
    _bfd_elf_init_2_index_sections
  
@@ -296,90 +289,31 @@ index faa27611d4..888af6bcd8 100644
  #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
+index 72616b57691..42f708118fb 100644
 --- a/ld/emulparams/aarch64elf.sh
 +++ b/ld/emulparams/aarch64elf.sh
-@@ -1,3 +1,5 @@
+@@ -1,4 +1,5 @@
-+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
+ source_sh ${srcdir}/emulparams/dt-relr.sh
-+
++source_sh ${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
+index 45bf31a179a..02e0cad8699 100644
 --- a/ld/emulparams/aarch64elf32.sh
 +++ b/ld/emulparams/aarch64elf32.sh
-@@ -1,3 +1,5 @@
+@@ -1,4 +1,5 @@
-+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
+ source_sh ${srcdir}/emulparams/dt-relr.sh
-+
++source_sh ${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
+index aa2859d4f73..c680dca8f86 100644
 --- a/ld/emultempl/aarch64elf.em
 +++ b/ld/emultempl/aarch64elf.em
-@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
+@@ -368,7 +368,7 @@ PARSE_AND_LIST_LONGOPTS='
    { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
  '
  
@@ -388,25 +322,57 @@ index 45e40b510c..916ef2086a 100644
    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
+diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
-index f4f7ad6b4e..8428a54697 100644
+index 863657e12f5..672974df511 100644
---- a/ld/emultempl/elf32.em
+--- a/ld/emultempl/elf.em
-+++ b/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf.em
-@@ -192,6 +192,9 @@ static char *depaudit; /* colon (typically) separated list of libs */
+@@ -813,6 +813,7 @@ EOF
- /* Style of .note.gnu.build-id section.  */
+ fi
- static const char *emit_note_gnu_build_id;
+ fragment <<EOF
+     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
++    {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
+     {"package-metadata", optional_argument, NULL, OPTION_PACKAGE_METADATA},
+     {"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
+     {"rosegment", no_argument, NULL, OPTION_ROSEGMENT},
+@@ -892,6 +893,18 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_NO_ROSEGMENT:
+       link_info.one_rosegment = false;
+       break;      
++
++    case OPTION_NX_MODULE_NAME:
++      if (ldelf_emit_nx_module_name != NULL)
++        {
++          free ((char *) ldelf_emit_nx_module_name);
++          ldelf_emit_nx_module_name = NULL;
++        }
++      if (optarg == NULL)
++        optarg = "";
++      ldelf_emit_nx_module_name = xstrdup (optarg);
++      break;
++
+ EOF
+ 
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index 09691609fc0..5769b4aa0f9 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -55,6 +55,9 @@ const char *ldelf_emit_note_gnu_build_id;
+ /* Content of .note.package section.  */
+ const char *ldelf_emit_note_fdo_package_metadata;
  
 +/* NX module name. */
-+static const char *emit_nx_module_name;
++const char *ldelf_emit_nx_module_name;
 +
- /* On Linux, it's possible to have different versions of the same
+ /* These variables are required to pass information back and forth
-    shared library linked against different versions of libc.  The
+    between after_open and check_needed and stat_needed and vercheck.  */
-    dynamic linker somehow tags which libc version to use in
+ 
-@@ -1217,6 +1220,92 @@ setup_build_id (bfd *ibfd)
+@@ -1209,8 +1212,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
-   return FALSE;
+   *save_input_bfd_tail = NULL;
  }
  
-+static bfd_boolean
+-/* This is called before calling plugin 'all symbols read' hook.  */
++static bool
 +write_nx_module_name (bfd *abfd)
 +{
 +  struct elf_obj_tdata *t = elf_tdata (abfd);
@@ -416,14 +382,14 @@ index f4f7ad6b4e..8428a54697 100644
 +  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;
++      return true;
 +    }
 +  i_shdr = &elf_section_data (asec->output_section)->this_hdr;
 +
@@ -445,26 +411,26 @@ index f4f7ad6b4e..8428a54697 100644
 +  position = i_shdr->sh_offset + asec->output_offset;
 +
 +  return (bfd_seek (abfd, position, SEEK_SET) == 0
-+	  && bfd_bwrite (contents, size, abfd) == size);
++	  && bfd_write (contents, size, abfd) == size);
 +}
 +
 +/* Make .nx-module-name section, and set up elf_tdata->nx_module_name.  */
 +
-+static bfd_boolean
++static bool
 +setup_nx_module_name (bfd *ibfd, bfd *obfd)
 +{
 +  asection *s;
 +  bfd_size_type size;
 +  flagword flags;
 +
-+  if (emit_nx_module_name[0] == '\0')
++  if (ldelf_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);
++      free ((char *) ldelf_emit_nx_module_name);
-+      emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
++      ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
-+      emit_nx_module_name = xstrdup (emit_nx_module_name);
++      ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
-+      dot_pos = strrchr (emit_nx_module_name, '.');
++      dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
 +      if (dot_pos != NULL)
 +        {
 +          /* Remove extension. */
@@ -472,34 +438,35 @@ index f4f7ad6b4e..8428a54697 100644
 +        }
 +    }
 +
-+  size = 8 + strlen(emit_nx_module_name) + 1; /* extra null terminator for AMS */
++  size = 8 + strlen(ldelf_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))
++  if (s != NULL && bfd_set_section_alignment (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.name = ldelf_emit_nx_module_name;
 +      t->o->nx_module_name.sec = s;
 +      elf_section_type (s) = SHT_PROGBITS;
 +      s->size = size;
-+      return TRUE;
++      return true;
 +    }
 +
 +  einfo (_("%P: warning: cannot create .nx-module-name section,"
 +	   " --nx-module-name ignored\n"));
-+  return FALSE;
++  return false;
 +}
 +
- /* This is called after all the input files have been opened.  */
++/* This is called before calling plugin 'all symbols read' hook.  */
- 
+ void
- static void
+ ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
-@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
+ 				      int is_linux, int is_freebsd,
+@@ -1289,6 +1377,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
  	}
      }
  
-+  if (emit_nx_module_name != NULL)
++  if (ldelf_emit_nx_module_name != NULL)
 +    {
 +      /* Find an ELF input.  */
 +      for (abfd = link_info.input_bfds;
@@ -512,93 +479,35 @@ index f4f7ad6b4e..8428a54697 100644
 +      /* 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);
++          free ((char *) ldelf_emit_nx_module_name);
-+          emit_nx_module_name = NULL;
++          ldelf_emit_nx_module_name = NULL;
 +        }
 +    }
 +
    get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
  
-   if (bfd_link_relocatable (&link_info))
+   /* Do not allow executable files to be used as inputs to the link.  */
-@@ -2720,6 +2827,7 @@ enum elf_options
+diff --git a/ld/ldelf.h b/ld/ldelf.h
-   OPTION_EXCLUDE_LIBS,
+index 239194772c4..68516dbf45e 100644
-   OPTION_HASH_STYLE,
+--- a/ld/ldelf.h
++++ b/ld/ldelf.h
+@@ -20,6 +20,7 @@
+ 
+ extern const char *ldelf_emit_note_gnu_build_id;
+ extern const char *ldelf_emit_note_fdo_package_metadata;
++extern const char *ldelf_emit_nx_module_name;
+ 
+ extern void ldelf_after_parse (void);
+ extern bool ldelf_load_symbols (lang_input_statement_type *);
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index defe3fcbbb9..30f31df990e 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -186,6 +186,7 @@ enum option_values
+   /* Used by emultempl/elf.em, emultempl/pe.em and emultempl/pep.em.  */
    OPTION_BUILD_ID,
+   OPTION_EXCLUDE_LIBS,
 +  OPTION_NX_MODULE_NAME,
-   OPTION_AUDIT,
+   /* Used by emulparams/elf32mcore.sh, emultempl/beos.em, emultempl/pe.em
-   OPTION_COMPRESS_DEBUG
+      and emultempl/pep.em.  */
- };
+   OPTION_BASE_FILE,
-@@ -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 ();

dka64/patches/gcc-14.2.0.patch

@@ -1,8 +1,8 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index cf1a87e2efd..bd79664568e 100644
+index 95c91ee02be..4711542eee5 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -1039,7 +1039,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -1195,7 +1195,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
  	tmake_file="${tmake_file} aarch64/t-aarch64"
  	case $target in
  	aarch64-*-elf*)
@@ -18,7 +18,7 @@ index cf1a87e2efd..bd79664568e 100644
          aarch64-*-fuchsia*)
                  tm_file="${tm_file} fuchsia.h"
 diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index da5872cf4d8..ca840ab29cb 100644
+index 5396da9b2d6..87235d680ad 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
 @@ -22,6 +22,7 @@
@@ -30,27 +30,24 @@ index da5872cf4d8..ca840ab29cb 100644
  #define ENDFILE_SPEC \
    " crtend%O%s crtn%O%s " \
 diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
-index ee7bed34924..d1e2742d750 100644
+index a05c0d3ded1..5551807e4c6 100644
 --- a/gcc/config/aarch64/aarch64-opts.h
 +++ b/gcc/config/aarch64/aarch64-opts.h
-@@ -48,6 +48,12 @@ enum aarch64_tls_type {
+@@ -80,7 +80,8 @@ enum aarch64_tp_reg {
-   TLS_DESCRIPTORS
+   AARCH64_TPIDR_EL1 = 1,
+   AARCH64_TPIDR_EL2 = 2,
+   AARCH64_TPIDR_EL3 = 3,
+-  AARCH64_TPIDRRO_EL0 = 4
++  AARCH64_TPIDRRO_EL0 = 4,
++  AARCH64_TP_SOFT = 5
  };
  
-+/* Which thread pointer access sequence to use.  */
+ /* SVE vector register sizes.  */
-+enum aarch64_tp_type {
+diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
-+  TP_HARD,
+index 1beec94629d..90a9ec580f8 100644
-+  TP_SOFT
+--- a/gcc/config/aarch64/aarch64.cc
-+};
++++ b/gcc/config/aarch64/aarch64.cc
-+
+@@ -21060,8 +21060,24 @@ aarch64_load_tp (rtx target)
- /* The code model defines the address generation strategy.
-    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 409ca8d9519..fa57bbf8cd5 100644
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -15951,8 +15951,24 @@ aarch64_load_tp (rtx target)
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -78,32 +75,31 @@ index 409ca8d9519..fa57bbf8cd5 100644
  }
  
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index 24767c747ba..0b1bbb5d79e 100644
+index 4fa1dfc7906..43a01fe3d56 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -1134,6 +1134,10 @@ typedef struct
+@@ -1377,6 +1377,10 @@ typedef struct
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
 +/* Check selected thread pointer access sequence to use.  */
-+#define TARGET_HARD_TP (target_thread_pointer == TP_HARD)
++#define TARGET_HARD_TP (aarch64_tpidr_reg != AARCH64_TP_SOFT)
-+#define TARGET_SOFT_TP (target_thread_pointer == TP_SOFT)
++#define TARGET_SOFT_TP (aarch64_tpidr_reg == AARCH64_TP_SOFT)
 +
  extern enum aarch64_code_model aarch64_cmodel;
  
  /* When using the tiny addressing model conditional and unconditional branches
 diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index 8c8be3c2740..1257616a659 100644
+index dbde066f747..3e3198bf52f 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -6789,11 +6789,22 @@
+@@ -7436,11 +7436,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
 -  ""
--  "mrs\\t%0, tpidr_el0"
 +  "TARGET_HARD_TP"
-+  "mrs\\t%0, tpidr_el0\\t// aarch64_load_tp_hard"
+   "* return aarch64_output_load_tp (operands[0]);"
    [(set_attr "type" "mrs")]
  )
  
@@ -122,46 +118,34 @@ index 8c8be3c2740..1257616a659 100644
  ;; instructions in the TLS stubs, in order to enable linker relaxation.
  ;; Therefore we treat the stubs as an atomic sequence.
 diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
-index d99d14c137d..08e52537dc6 100644
+index 6356c419399..a6907ed0a0b 100644
 --- a/gcc/config/aarch64/aarch64.opt
 +++ b/gcc/config/aarch64/aarch64.opt
-@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
+@@ -128,6 +128,9 @@ Enum(tp_reg) String(tpidr_el3) Value(AARCH64_TPIDR_EL3)
  EnumValue
- Enum(aarch64_tls_size) String(48) Value(48)
+ Enum(tp_reg) String(tpidrro_el0) Value(AARCH64_TPIDRRO_EL0)
  
-+mtp=
-+Target RejectNegative Joined Enum(aarch64_tp_type) Var(target_thread_pointer) Init(TP_HARD)
-+Specify how to access the thread pointer.
-+
-+Enum
-+Name(aarch64_tp_type) Type(enum aarch64_tp_type)
-+Valid arguments to -mtp=:
-+
 +EnumValue
-+Enum(aarch64_tp_type) String(hard) Value(TP_HARD)
++Enum(tp_reg) String(soft) Value(AARCH64_TP_SOFT)
 +
-+EnumValue
+ mtp=
-+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
+ Target RejectNegative Joined Enum(tp_reg) Var(aarch64_tpidr_reg) Init(AARCH64_TPIDR_EL0) Save
-+
+ Specify the thread pointer register.
-+
+@@ -329,7 +332,7 @@ TargetVariable
- march=
- Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
- Use features of architecture ARCH.
-@@ -256,7 +271,7 @@ TargetVariable
  long aarch64_stack_protector_guard_offset = 0
  
  moutline-atomics
--Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
+-Target Var(aarch64_flag_outline_atomics) Init(2) Save
-+Target Report Var(aarch64_flag_outline_atomics) Save
++Target Var(aarch64_flag_outline_atomics) Save
  Generate local calls to out-of-line atomic operations.
  
- -param=aarch64-sve-compare-costs=
+ -param=aarch64-vect-compare-costs=
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 11d20b7be14..02ca761d3bf 100644
+index 78713558e7d..76c0914d8ce 100644
 --- a/gcc/config/aarch64/t-aarch64
 +++ b/gcc/config/aarch64/t-aarch64
-@@ -159,8 +159,10 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
+@@ -208,8 +208,10 @@ aarch64-ldp-fusion.o: $(srcdir)/config/aarch64/aarch64-ldp-fusion.cc \
- 		$(srcdir)/config/aarch64/aarch64-bti-insert.c
+ 		$(srcdir)/config/aarch64/aarch64-ldp-fusion.cc
  
  comma=,
 -MULTILIB_OPTIONS    = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
@@ -175,10 +159,10 @@ index 11d20b7be14..02ca761d3bf 100644
  s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
 diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
 new file mode 100644
-index 00000000000..11ba0f5ab1c
+index 00000000000..a25459e4352
 --- /dev/null
 +++ b/gcc/config/devkitpro.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -207,6 +191,7 @@ index 00000000000..11ba0f5ab1c
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
++        builtin_define ("__DEVKITPRO__");       \
 +    } while (0)
 +
 +
@@ -245,53 +230,34 @@ index 00000000000..9acbbf9d27c
 +Driver
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
+diff --git a/gcc/config/devkitpro.opt.urls b/gcc/config/devkitpro.opt.urls
-index 250fef59b55..36b2239aa5d 100644
+new file mode 100644
---- a/gcc/config/i386/host-mingw32.c
+index 00000000000..ab7b466aa71
-+++ b/gcc/config/i386/host-mingw32.c
+--- /dev/null
-@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
++++ b/gcc/config/devkitpro.opt.urls
- 
+@@ -0,0 +1 @@
- static inline void w32_error(const char*, const char*, int, const char*);
++; Autogenerated by regenerate-opt-urls.py from gcc/config/devkitpro.opt and generated HTML
- 
+diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
--/* FIXME: Is this big enough?  */
+index 42563982e42..923dc198a7e 100644
--static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
+--- a/gcc/config/i386/host-mingw32.cc
--
++++ b/gcc/config/i386/host-mingw32.cc
- /* Granularity for reserving address space.  */
+@@ -93,7 +93,10 @@ mingw32_gt_pch_get_address (size_t size, int)
- static size_t va_granularity = 0x10000;
+      for NT system dlls is in 0x70000000 to 0x78000000 range.
- 
-@@ -88,9 +85,6 @@ static void *
- mingw32_gt_pch_get_address (size_t size, int)
- {
-   void* res;
--  size = (size + va_granularity - 1) & ~(va_granularity - 1);
--  if (size > pch_VA_max_size)
--    return NULL;
- 
-   /* FIXME: We let system determine base by setting first arg to NULL.
-      Allocating at top of available address space avoids unnecessary
-@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
       If we allocate at bottom we need to reserve the address as early
       as possible and at the same point in each invocation. */
-  
+- 
--  res = VirtualAlloc (NULL, pch_VA_max_size,
++
-+  res = VirtualAlloc (NULL, size,
++#if __MINGW64__
++  size  = UINT64_C(64 * 1024 * 1024 * 1024);
++#endif
+   res = VirtualAlloc (NULL, size,
  		      MEM_RESERVE | MEM_TOP_DOWN,
  		      PAGE_NOACCESS);
-   if (!res)
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
+index 728332b8153..47fc03eb8c8 100644
- 
+--- a/gcc/gcc.cc
-   /* Offset must be also be a multiple of allocation granularity for
++++ b/gcc/gcc.cc
-      this to work.  We can't change the offset. */ 
+@@ -881,6 +881,11 @@ proper position among the other output files.  */
--  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
-+  if ((offset & (va_granularity - 1)) != 0)
-     return -1;
- 
- 
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..97f52d0b893 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -793,6 +793,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -303,7 +269,7 @@ index 9f790db0daf..97f52d0b893 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1208,6 +1213,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;
@@ -311,7 +277,7 @@ index 9f790db0daf..97f52d0b893 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
+@@ -1720,6 +1726,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),
@@ -319,8 +285,34 @@ index 9f790db0daf..97f52d0b893 100644
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
+diff --git a/libcc1/configure b/libcc1/configure
+index ea689a353c8..98f9d9b21b7 100755
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -5119,7 +5119,7 @@ else
+        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+-       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
++       $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ 	 break
+ 	 ;;
+        *)
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+index 38d3859a73c..f97358d9787 100644
+--- a/libgcc/crtstuff.c
++++ b/libgcc/crtstuff.c
+@@ -326,7 +326,7 @@ register_tm_clones (void)
+ 
+ #ifdef OBJECT_FORMAT_ELF
+ 
+-#if DEFAULT_USE_CXA_ATEXIT
++#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
 diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index f31cf083cbe..649f900aac3 100644
+index 33c2d8ff630..2a0a9c1e87e 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -333,10 +325,10 @@ index f31cf083cbe..649f900aac3 100644
  #define GTHREAD_USE_WEAK 0
  #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 80aeb3f8959..308ceedc673 100644
+index 422a0f4bd0a..ee09ada9170 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
-@@ -1315,6 +1315,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1429,6 +1429,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' \
@@ -345,10 +337,10 @@ index 80aeb3f8959..308ceedc673 100644
  	    < $< > $@
  
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index eb437ad8d8d..6e076fc63bd 100644
+index 9fd4ab4848c..beea48941a3 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
-@@ -1793,6 +1793,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1903,6 +1903,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' \
@@ -356,3 +348,16 @@ index eb437ad8d8d..6e076fc63bd 100644
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
+diff --git a/lto-plugin/configure b/lto-plugin/configure
+index 28f5dd79cd7..a79f318a4d6 100755
+--- a/lto-plugin/configure
++++ b/lto-plugin/configure
+@@ -6469,7 +6469,7 @@ else
+        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+-       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
++       $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ 	 break
+ 	 ;;
+        *)

dka64/scripts/build-crtls.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+#---------------------------------------------------------------------------------
+# set env variables
+#---------------------------------------------------------------------------------
+export DEVKITPRO=$TOOLPATH
+
+#---------------------------------------------------------------------------------
+# Install the rules files
+#---------------------------------------------------------------------------------
+cd $BUILDDIR
+
+tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.gz
+cd devkita64-rules-$DKA64_RULES_VER
+$MAKE install

dka64/scripts/build-gcc.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+	#!/bin/sh
 #---------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------
@@ -10,7 +10,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
         --prefix=$prefix --target=$target --disable-nls --disable-werror \
 	--enable-lto --enable-plugins --enable-poison-system-directories \
 	$CROSS_PARAMS \
@@ -39,9 +39,6 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -52,7 +49,7 @@ then
 		--enable-cxx-flags='-ffunction-sections' \
 		--disable-libstdcxx-verbose \
 		--enable-poison-system-directories \
-		--enable-interwork --enable-multilib \
+		--enable-multilib \
 		--enable-threads --disable-win32-registry --disable-nls --disable-debug\
 		--disable-libmudflap --disable-libssp --disable-libgomp \
 		--disable-libstdcxx-pch \
@@ -62,11 +59,13 @@ then
 		--with-newlib=yes \
 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 		--prefix=$prefix \
-		--enable-lto $plugin_ld\
+		--enable-lto \
-		--with-system-zlib \
+		--disable-tm-clone-registry \
-		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 15" \
+		--disable-__cxa_atexit \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 27" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+		$EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -148,43 +147,3 @@ then
 fi
 
 rm -fr $prefix/$target/sys-include
-
-cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-PLATFORM=`uname -s`
-
-if [ ! -f configured-gdb ]
-then
-	CPPFLAGS="$cppflags" \
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
-	../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	|| { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-
-#---------------------------------------------------------------------------------
-# copy base rulesets
-#---------------------------------------------------------------------------------
-cp -v $BUILDSCRIPTDIR/dka64/rules/* $prefix

dkarm-eabi/patches/gcc-10.1.0.patch

@@ -1,238 +0,0 @@
-diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 728be500b80..74c1abad635 100644
---- a/gcc/config/arm/arm-cpus.in
-+++ b/gcc/config/arm/arm-cpus.in
-@@ -392,7 +392,7 @@ begin arch armv6k
-  tune for mpcore
-  tune flags CO_PROC
-  base 6K
-- isa ARMv6k
-+ isa ARMv6k VFPv2 FP_DBL
-  option fp add VFPv2 FP_DBL
-  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 3d92bd23322..35cefcde676 100644
---- a/gcc/config/arm/t-arm-elf
-+++ b/gcc/config/arm/t-arm-elf
-@@ -16,111 +16,14 @@
- # along with GCC; see the file COPYING3.  If not see
- # <http://www.gnu.org/licenses/>.
- 
--# Build a very basic set of libraries that should cater for most cases.
--
--# Single-precision floating-point is NOT supported; we don't build a
--# suitable library for that.  Use the rm-profile config in that case.
--
--# PART 1 - Useful groups of options
--
--dp_fpus		:= vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
--		   neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
--		   fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
--		   vfp3
--
--sp_fpus		:= vfpv3xd vfpv3xd-fp16  fpv4-sp-d16 fpv5-sp-d16
--
--v7a_fps		:= vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
--v7ve_fps	:= vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
--		   neon-fp16 simd
--
--# Not all these permutations exist for all architecture variants, but
--# it seems to work ok.
--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	:= armv4 armv4t armv5t
--
--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 \
--		   armv8.5-a armv8.6-a
--
--# No floating point variants, require thumb1 softfp
--all_nofp_t	:= armv6-m armv6s-m armv8-m.base
--
--all_nofp_t2	:= armv7-m
--
--all_sp_only	:= armv7e-m armv8-m.main
--
--MULTILIB_OPTIONS     =
--MULTILIB_DIRNAMES    =
-+MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k mfloat-abi=hard
-+MULTILIB_DIRNAMES    = thumb be armv6k fpu
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     =
--MULTILIB_REUSE	     =
--
--# PART 2 - multilib build rules
--
--MULTILIB_OPTIONS     += marm/mthumb
--MULTILIB_DIRNAMES    += arm thumb
--
--MULTILIB_OPTIONS     += mfpu=auto
--MULTILIB_DIRNAMES    += autofp
--
--MULTILIB_OPTIONS     += march=armv5te+fp/march=armv7+fp
--MULTILIB_DIRNAMES    += v5te v7
--
--MULTILIB_OPTIONS     += mfloat-abi=hard
--MULTILIB_DIRNAMES    += fpu
--
--# Build a total of 4 library variants (base options plus the following):
--MULTILIB_REQUIRED    += mthumb
--MULTILIB_REQUIRED    += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
--MULTILIB_REQUIRED    += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
--
--# PART 3 - Match rules
--
--# Map all supported FPUs onto mfpu=auto
--MULTILIB_MATCHES     += $(foreach FPU, $(dp_fpus), \
--			  mfpu?auto=mfpu?$(FPU))
--
--MULTILIB_MATCHES     += march?armv5te+fp=march?armv5te
--
--MULTILIB_MATCHES     += $(foreach ARCH, $(all_early_arch), \
--		          march?armv5te+fp=march?$(ARCH) \
--			  march?armv5te+fp=march?$(ARCH)+fp)
--
--MULTILIB_MATCHES     += march?armv7+fp=march?armv7
--
--MULTILIB_MATCHES     += $(foreach FPARCH, $(v7a_fps), \
--		          march?armv7+fp=march?armv7-a+$(FPARCH))
--
--MULTILIB_MATCHES     += $(foreach FPARCH, $(v7ve_fps), \
--		          march?armv7+fp=march?armv7ve+$(FPARCH))
--
--MULTILIB_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
--MULTILIB_REUSE	     += mthumb=mthumb/march.armv5te+fp
--MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
--MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
--MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
--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
-diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index 9ad2947505f..1790caa8e88 100644
---- a/gcc/config/arm/unknown-elf.h
-+++ b/gcc/config/arm/unknown-elf.h
-@@ -29,7 +29,7 @@
- #endif
- 
- /* Now we define the strings used to build the spec file.  */
--#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s crt0%O%s"
-+#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s"
- 
- #undef  STARTFILE_SPEC
- #define STARTFILE_SPEC	\
-@@ -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 %{!nolibc:%L} --end-group"
-+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
-+
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-index 250fef59b55..36b2239aa5d 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
- 
- static inline void w32_error(const char*, const char*, int, const char*);
- 
--/* FIXME: Is this big enough?  */
--static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
--
- /* Granularity for reserving address space.  */
- static size_t va_granularity = 0x10000;
- 
-@@ -88,9 +85,6 @@ static void *
- mingw32_gt_pch_get_address (size_t size, int)
- {
-   void* res;
--  size = (size + va_granularity - 1) & ~(va_granularity - 1);
--  if (size > pch_VA_max_size)
--    return NULL;
- 
-   /* FIXME: We let system determine base by setting first arg to NULL.
-      Allocating at top of available address space avoids unnecessary
-@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
-      If we allocate at bottom we need to reserve the address as early
-      as possible and at the same point in each invocation. */
-  
--  res = VirtualAlloc (NULL, pch_VA_max_size,
-+  res = VirtualAlloc (NULL, size,
- 		      MEM_RESERVE | MEM_TOP_DOWN,
- 		      PAGE_NOACCESS);
-   if (!res)
-@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
- 
-   /* Offset must be also be a multiple of allocation granularity for
-      this to work.  We can't change the offset. */ 
--  if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
-+  if ((offset & (va_granularity - 1)) != 0)
-     return -1;
- 
- 
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..97f52d0b893 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -793,6 +793,11 @@ proper position among the other output files.  */
- #endif
- #endif
- 
-+#ifndef LIBGLOSS_SPEC
-+# define LIBGLOSS_SPEC "-lsysbase"
-+#endif
-+
-+
- /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
- #ifndef STARTFILE_SPEC
- #define STARTFILE_SPEC  \
-@@ -1085,6 +1090,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;
-+static const char *libgloss_spec = LIBGLOSS_SPEC;
- static const char *endfile_spec = ENDFILE_SPEC;
- static const char *startfile_spec = STARTFILE_SPEC;
- static const char *linker_name_spec = LINKER_NAME;
-@@ -1582,6 +1588,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),
-+  INIT_STATIC_SPEC ("libgloss",			&libgloss_spec),
-   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
-   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
-   INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
-index dddddc7c444..c2502597953 100644
---- a/libgcc/config/arm/t-bpabi
-+++ b/libgcc/config/arm/t-bpabi
-@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
- # On ARM, specifying -fnon-call-exceptions will needlessly pull in
- # the unwinder in simple programs which use 64-bit division.  Omitting
- # the option is safe.
--LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
-+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions

dkarm-eabi/patches/gcc-15.1.0.patch

@@ -0,0 +1,593 @@
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 40b50dc969e..16b1224f3ec 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1508,6 +1508,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
+ 	  tm_file="$tm_file newlib-stdint.h"
+ 	  tmake_file="${tmake_file} arm/t-bpabi"
+ 	  use_gcc_stdint=wrap
++	  tm_file="${tm_file} devkitpro.h"
++	  extra_options="${extra_options} devkitpro.opt"
++	  case ${enable_threads} in
++		"" | yes | posix) thread_file='posix' ;;
++	  esac
+ 	  ;;
+ 	arm*-*-fuchsia*)
+ 	  tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
+diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
+index 1939d55b9fd..62d425cb596 100644
+--- a/gcc/config/arm/arm-cpus.in
++++ b/gcc/config/arm/arm-cpus.in
+@@ -416,7 +416,7 @@ begin arch armv6k
+  tune for mpcore
+  tune flags CO_PROC
+  base 6K
+- isa ARMv6k
++ isa ARMv6k VFPv2 FP_DBL
+  option fp add VFPv2 FP_DBL
+  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 fdfdf9c580b..add129f0a62 100644
+--- a/gcc/config/arm/t-arm-elf
++++ b/gcc/config/arm/t-arm-elf
+@@ -16,120 +16,22 @@
+ # along with GCC; see the file COPYING3.  If not see
+ # <http://www.gnu.org/licenses/>.
+ 
+-# Build a very basic set of libraries that should cater for most cases.
+-
+-# Single-precision floating-point is NOT supported; we don't build a
+-# suitable library for that.  Use the rm-profile config in that case.
+-
+-# PART 1 - Useful groups of options
+-
+-dp_fpus		:= vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
+-		   neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
+-		   fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
+-		   vfp3
+-
+-sp_fpus		:= vfpv3xd vfpv3xd-fp16  fpv4-sp-d16 fpv5-sp-d16
+-
+-v7a_fps		:= vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
+-v7ve_fps	:= vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
+-		   neon-fp16 simd
+-
+-# Not all these permutations exist for all architecture variants, but
+-# it seems to work ok.
+-v8_fps		:= simd fp16 crypto fp16+crypto dotprod fp16fml
+-
+-v9_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	:= armv4 armv4t armv5t
+-
+-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 \
+-		   armv8.5-a armv8.6-a
+-
+-all_v9_archs	:= armv9-a
+-
+-# No floating point variants, require thumb1 softfp
+-all_nofp_t	:= armv6-m armv6s-m armv8-m.base
+-
+-all_nofp_t2	:= armv7-m
+-
+-all_sp_only	:= armv7e-m armv8-m.main
+-
+-MULTILIB_OPTIONS     =
+-MULTILIB_DIRNAMES    =
++MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
++MULTILIB_DIRNAMES    = thumb be armv6k v6-m fpu nofp
+ MULTILIB_EXCEPTIONS  = 
+ MULTILIB_MATCHES     =
+-MULTILIB_REUSE	     =
+-
+-# PART 2 - multilib build rules
+-
+-MULTILIB_OPTIONS     += marm/mthumb
+-MULTILIB_DIRNAMES    += arm thumb
+-
+-MULTILIB_OPTIONS     += mfpu=auto
+-MULTILIB_DIRNAMES    += autofp
+-
+-MULTILIB_OPTIONS     += march=armv5te+fp/march=armv7+fp
+-MULTILIB_DIRNAMES    += v5te v7
+-
+-MULTILIB_OPTIONS     += mfloat-abi=hard
+-MULTILIB_DIRNAMES    += fpu
+-
+-# Build a total of 4 library variants (base options plus the following):
+-MULTILIB_REQUIRED    += mthumb
+-MULTILIB_REQUIRED    += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
+-MULTILIB_REQUIRED    += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
+-
+-# PART 3 - Match rules
+-
+-# Map all supported FPUs onto mfpu=auto
+-MULTILIB_MATCHES     += $(foreach FPU, $(dp_fpus), \
+-			  mfpu?auto=mfpu?$(FPU))
+-
+-MULTILIB_MATCHES     += march?armv5te+fp=march?armv5te
+-
+-MULTILIB_MATCHES     += $(foreach ARCH, $(all_early_arch), \
+-		          march?armv5te+fp=march?$(ARCH) \
+-			  march?armv5te+fp=march?$(ARCH)+fp)
+-
+-MULTILIB_MATCHES     += march?armv7+fp=march?armv7
+-
+-MULTILIB_MATCHES     += $(foreach FPARCH, $(v7a_fps), \
+-		          march?armv7+fp=march?armv7-a+$(FPARCH))
+-
+-MULTILIB_MATCHES     += $(foreach FPARCH, $(v7ve_fps), \
+-		          march?armv7+fp=march?armv7ve+$(FPARCH))
+-
+-MULTILIB_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 mthumb/march=armv6s-m/mfloat-abi=soft
+ 
+-MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
+-			  march?armv7+fp=march?$(ARCH) \
+-			  $(foreach FPARCH, $(v9_fps), \
+-			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
+ 
+-MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
+-			  march?armv7+fp=march?$(ARCH)+fp.dp)
++MULTILIB_MATCHES    += march?armv6k=mtune?mpcore
++MULTILIB_MATCHES    += march?armv6k=mcpu?mpcore
+ 
+-# PART 4 - Reuse rules
++MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0
++MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0
++MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m0plus
++MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m0plus
++MULTILIB_MATCHES    += march?armv6s-m=mcpu?cortex-m1
++MULTILIB_MATCHES    += march?armv6s-m=mtune?cortex-m1
+ 
+-MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto
+-MULTILIB_REUSE	     += mthumb=mthumb/mfpu.auto/march.armv5te+fp
+-MULTILIB_REUSE	     += mthumb=mthumb/march.armv5te+fp
+-MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
+-MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
+-MULTILIB_REUSE	     += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
+-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_REUSE       = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
+diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
+index ab3918283d8..c14a1955cad 100644
+--- a/gcc/config/arm/unknown-elf.h
++++ b/gcc/config/arm/unknown-elf.h
+@@ -29,7 +29,7 @@
+ #endif
+ 
+ /* Now we define the strings used to build the spec file.  */
+-#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s crt0%O%s"
++#define UNKNOWN_ELF_STARTFILE_SPEC	" crti%O%s crtbegin%O%s"
+ 
+ #undef  STARTFILE_SPEC
+ #define STARTFILE_SPEC	\
+@@ -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 %{!nolibc:%L} --end-group"
++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
++
+diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
+new file mode 100644
+index 00000000000..180a9ea8553
+--- /dev/null
++++ b/gcc/config/devkitpro.h
+@@ -0,0 +1,27 @@
++/* 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 ("__DEVKITPRO__");       \
++        builtin_define ("__DEVKITARM__");       \
++    } 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/config/devkitpro.opt.urls b/gcc/config/devkitpro.opt.urls
+new file mode 100644
+index 00000000000..ab7b466aa71
+--- /dev/null
++++ b/gcc/config/devkitpro.opt.urls
+@@ -0,0 +1 @@
++; Autogenerated by regenerate-opt-urls.py from gcc/config/devkitpro.opt and generated HTML
+diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
+index e083f49f3da..1b81e7e88ce 100644
+--- a/gcc/config/i386/host-mingw32.cc
++++ b/gcc/config/i386/host-mingw32.cc
+@@ -94,6 +94,10 @@ mingw32_gt_pch_get_address (size_t size, int)
+      If we allocate at bottom we need to reserve the address as early
+      as possible and at the same point in each invocation. */
+ 
++#if __MINGW64__
++  size  = UINT64_C(64 * 1024 * 1024 * 1024);
++#endif
++
+   res = VirtualAlloc (NULL, size,
+ 		      MEM_RESERVE | MEM_TOP_DOWN,
+ 		      PAGE_NOACCESS);
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 4fd87f2c4a1..6af06f7b032 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -888,6 +888,11 @@ proper position among the other output files.  */
+ #endif
+ #endif
+ 
++#ifndef LIBGLOSS_SPEC
++# define LIBGLOSS_SPEC "-lsysbase"
++#endif
++
++
+ /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
+ #ifndef STARTFILE_SPEC
+ #define STARTFILE_SPEC  \
+@@ -1215,6 +1220,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;
++static const char *libgloss_spec = LIBGLOSS_SPEC;
+ static const char *endfile_spec = ENDFILE_SPEC;
+ static const char *startfile_spec = STARTFILE_SPEC;
+ static const char *linker_name_spec = LINKER_NAME;
+@@ -1727,6 +1733,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),
++  INIT_STATIC_SPEC ("libgloss",			&libgloss_spec),
+   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
+   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
+   INIT_STATIC_SPEC ("version",			&compiler_version),
+diff --git a/libcc1/configure b/libcc1/configure
+index ea689a353c8..98f9d9b21b7 100755
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -5119,7 +5119,7 @@ else
+        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+-       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
++       $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ 	 break
+ 	 ;;
+        *)
+diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
+index dddddc7c444..c2502597953 100644
+--- a/libgcc/config/arm/t-bpabi
++++ b/libgcc/config/arm/t-bpabi
+@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
+ # On ARM, specifying -fnon-call-exceptions will needlessly pull in
+ # the unwinder in simple programs which use 64-bit division.  Omitting
+ # the option is safe.
+-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
++LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
+diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
+index b9767cd1eee..362689c9f0b 100644
+--- a/libgcc/crtstuff.c
++++ b/libgcc/crtstuff.c
+@@ -326,7 +326,7 @@ register_tm_clones (void)
+ 
+ #ifdef OBJECT_FORMAT_ELF
+ 
+-#if DEFAULT_USE_CXA_ATEXIT
++#if 1 /* DEFAULT_USE_CXA_ATEXIT */
+ /* Declare the __dso_handle variable.  It should have a unique value
+    in every shared-object; in a main program its value is zero.  The
+    object should in any case be protected.  This means the instance
+diff --git a/libgcc/gthr.h b/libgcc/gthr.h
+index 557417997f4..cb223aa43fc 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(__DEVKITARM__)
+ #undef GTHREAD_USE_WEAK
+ #define GTHREAD_USE_WEAK 0
+ #endif
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index 819a1d82876..d81e6057c5b 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -893,6 +893,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -1027,6 +1028,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1279,6 +1281,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1416,7 +1427,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1569,6 +1580,7 @@ Fine tuning of the installation directories:
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -5080,7 +5092,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -5126,7 +5138,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -5150,7 +5162,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -5195,7 +5207,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -5219,7 +5231,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -12280,7 +12292,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12283 "configure"
++#line 12295 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12386,7 +12398,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12389 "configure"
++#line 12401 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16182,7 +16194,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
+   # Fake what AC_TRY_COMPILE does.
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 16185 "configure"
++#line 16197 "configure"
+ int main()
+ {
+   typedef bool atomic_type;
+@@ -16217,7 +16229,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 16220 "configure"
++#line 16232 "configure"
+ int main()
+ {
+   typedef short atomic_type;
+@@ -16252,7 +16264,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 16255 "configure"
++#line 16267 "configure"
+ int main()
+ {
+   // NB: _Atomic_word not necessarily int.
+@@ -16288,7 +16300,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 16291 "configure"
++#line 16303 "configure"
+ int main()
+ {
+   typedef long long atomic_type;
+@@ -16445,7 +16457,7 @@ $as_echo "mutex" >&6; }
+   # unnecessary for this test.
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 16448 "configure"
++#line 16460 "configure"
+ int main()
+ {
+   _Decimal32 d1;
+@@ -16487,7 +16499,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+   # unnecessary for this test.
+ 
+   cat > conftest.$ac_ext << EOF
+-#line 16490 "configure"
++#line 16502 "configure"
+ template<typename T1, typename T2>
+   struct same
+   { typedef T2 type; };
+@@ -28602,6 +28614,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     $as_echo "#define HAVE_MEMALIGN 1" >>confdefs.h
+ 
++    $as_echo "#define HAVE_ALIGNED_ALLOC 1" >>confdefs.h
++
+ 
+     case "${target}" in
+       *-rtems*)
+diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
+index a6c01b29e94..a8fb1200c8b 100644
+--- a/libstdc++-v3/configure.ac
++++ b/libstdc++-v3/configure.ac
+@@ -386,6 +386,7 @@ dnl # rather than hardcoding that information.
+     fi
+ 
+     AC_DEFINE(HAVE_MEMALIGN)
++    AC_DEFINE(HAVE_ALIGNED_ALLOC)
+ 
+     case "${target}" in
+       *-rtems*)
+diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
+index 537774c2668..b15e28d2371 100644
+--- a/libstdc++-v3/include/Makefile.am
++++ b/libstdc++-v3/include/Makefile.am
+@@ -1436,6 +1436,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___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
+ 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
+ 	    < $< > $@
+ 
+diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
+index 7b96b2207f8..80f0effec92 100644
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -336,6 +336,7 @@ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+ python_mod_dir = @python_mod_dir@
++runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -1910,6 +1911,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___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
+ 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
+ 	    < $< > $@
+ 
+diff --git a/lto-plugin/configure b/lto-plugin/configure
+index 28f5dd79cd7..a79f318a4d6 100755
+--- a/lto-plugin/configure
++++ b/lto-plugin/configure
+@@ -6469,7 +6469,7 @@ else
+        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+-       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
++       $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ 	 break
+ 	 ;;
+        *)

dkarm-eabi/patches/gdb-8.2.1.patch

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

dkarm-eabi/scripts/build-crtls.sh

@@ -11,18 +11,16 @@ export DEVKITARM=$DEVKITPRO/devkitARM
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p rules
+tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.gz
-cd rules
+cd devkitarm-rules-$DKARM_RULES_VER
-tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
+$MAKE install
-make install
 
 #---------------------------------------------------------------------------------
 # Install and build the crt0 files
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p crtls
+tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz
-cd crtls
+cd devkitarm-crtls-$DKARM_CRTLS_VER
-tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
+$MAKE install
-make install
 

dkarm-eabi/scripts/build-gcc.sh

@@ -10,7 +10,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS="$ldflags $LDFLAGS" ../../binutils-$BINUTILS_VER/configure \
         --prefix=$prefix --target=$target --disable-nls --disable-werror \
 	--enable-lto --enable-plugins \
 	--enable-poison-system-directories \
@@ -41,7 +41,7 @@ cd $target/gcc
 if [ ! -f configured-gcc ]
 then
 	CPPFLAGS="$cppflags $CPPFLAGS" \
-	LDFLAGS="$ldflags" \
+	LDFLAGS="$ldflags $LDFLAGS" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -64,9 +64,12 @@ then
 		--prefix=$prefix \
 		--enable-lto\
 		--with-system-zlib \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 54" \
+		--disable-tm-clone-registry \
+		--disable-__cxa_atexit \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 66" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
+                $EXTRA_GCC_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -150,35 +153,3 @@ fi
 rm -fr $prefix/$target/sys-include
 
 cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-PLATFORM=`uname -s`
-
-if [ ! -f configured-gdb ]
-then
-	CPPFLAGS="$cppflags $CPPFLAGS" \
-	LDFLAGS="$ldflags" \
-	../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	|| { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-

dkppc/patches/binutils-2.32.patch

@@ -1,12 +0,0 @@
-diff -NBaur binutils-2.31.1/opcodes/ppc-opc.c binutils-2.31.1-ppc/opcodes/ppc-opc.c
---- binutils-2.31.1/opcodes/ppc-opc.c	2018-06-24 19:38:58.000000000 +0100
-+++ binutils-2.31.1-ppc/opcodes/ppc-opc.c	2018-11-01 10:59:42.814553627 +0000
-@@ -3501,7 +3501,7 @@
- #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
- 		 | PPC_OPCODE_TITAN)
- #define BOOKE	PPC_OPCODE_BOOKE
--#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
-+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
- #define PPCE300 PPC_OPCODE_E300
- #define PPCSPE	PPC_OPCODE_SPE
- #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/binutils-2.44.patch

@@ -0,0 +1,26 @@
+diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
+index da892988f5d..6b8efb9bbdb 100644
+--- a/ld/emulparams/elf32ppccommon.sh
++++ b/ld/emulparams/elf32ppccommon.sh
+@@ -23,7 +23,7 @@ else
+   unset SBSS_START_SYMBOLS
+   unset SBSS_END_SYMBOLS
+ fi
+-OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
++OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
+ OTHER_RELRO_SECTIONS="
+   .fixup        ${RELOCATING-0} : { *(.fixup) }
+   .got1         ${RELOCATING-0} : { *(.got1) }
+diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
+index e55bfe846cd..f160e290bce 100644
+--- a/opcodes/ppc-opc.c
++++ b/opcodes/ppc-opc.c
+@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
+ #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
+ 		 | PPC_OPCODE_TITAN)
+ #define BOOKE	PPC_OPCODE_BOOKE
+-#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
++#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
+ #define PPCE300 PPC_OPCODE_E300
+ #define PPCSPE	PPC_OPCODE_SPE
+ #define PPCSPE2 PPC_OPCODE_SPE2

dkppc/patches/gcc-8.4.0.patch

@@ -1,933 +0,0 @@
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..814104f32a2 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
- [
- case $1 in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-     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 47cfce25dee..cfd8ce71123 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2480,7 +2480,7 @@ powerpc-xilinx-eabi*)
- 	use_gcc_stdint=wrap
- 	;;
- powerpc-*-eabi*)
--	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h"
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/750cl.h"
- 	extra_options="${extra_options} rs6000/sysv4.opt"
- 	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
- 	use_gcc_stdint=wrap
-diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index f46e797d610..fd39e64c38d 100644
---- a/gcc/config/newlib-stdint.h
-+++ b/gcc/config/newlib-stdint.h
-@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- /* newlib uses 32-bit long in certain cases for all non-SPU
-    targets.  */
- #ifndef STDINT_LONG32
--#define STDINT_LONG32 (LONG_TYPE_SIZE == 32)
-+#define STDINT_LONG32 0
- #endif
- 
- #define SIG_ATOMIC_TYPE "int"
-diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index b83b304e3eb..b85359edcfc 100644
---- a/gcc/config/rs6000/rs6000.h
-+++ b/gcc/config/rs6000/rs6000.h
-@@ -212,6 +212,7 @@
-   { "asm_cpu_476",		ASM_CPU_476_SPEC },			\
-   SUBTARGET_EXTRA_SPECS
- 
-+#if 0
- /* -mcpu=native handling only makes sense with compiler running on
-    an PowerPC chip.  If changing this condition, also change
-    the condition in driver-rs6000.c.  */
-@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
- #else
- #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
- #endif
-+#endif
-+#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
- 
- #ifndef CC1_CPU_SPEC
- #ifdef HAVE_LOCAL_CPU_DETECT
-diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
-index 4dbe8e5d133..3e2095e5b64 100644
---- a/gcc/config/rs6000/rs6000.md
-+++ b/gcc/config/rs6000/rs6000.md
-@@ -5631,19 +5631,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
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- 
- /* Default starting address if specified.  */
- #define LINK_START_SPEC "\
--%{mads         : %(link_start_ads)         ; \
-+%{mgcn|mogc    : %(link_start_ogc)         ; \
-+  mvgc         : %(link_start_vgc)         ; \
-+  mgcbios      : %(link_start_gcb)         ; \
-+  mrvl         : %(link_start_rvl)         ; \
-+  mads         : %(link_start_ads)         ; \
-   myellowknife : %(link_start_yellowknife) ; \
-   mmvme        : %(link_start_mvme)        ; \
-   msim         : %(link_start_sim)         ; \
-@@ -596,7 +600,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
--%{mads         : %(link_os_ads)         ; \
-+%{mgcn|mogc|mvgc|mgcbios|mrvl         : %(link_os_ogc)         ; \
-+  mads         : %(link_os_ads)         ; \
-   myellowknife : %(link_os_yellowknife) ; \
-   mmvme        : %(link_os_mvme)        ; \
-   msim         : %(link_os_sim)         ; \
-@@ -614,7 +619,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- /* Override rs6000.h definition.  */
- #undef	CPP_SPEC
- #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
--%{mads         : %(cpp_os_ads)         ; \
-+%{mgcn         : %(cpp_os_gcn)         ; \
-+  mogc|mvgc|mgcbios         : %(cpp_os_ogc)         ; \
-+  mrvl         : %(cpp_os_rvl)         ; \
-+  mads         : %(cpp_os_ads)         ; \
-   myellowknife : %(cpp_os_yellowknife) ; \
-   mmvme        : %(cpp_os_mvme)        ; \
-   msim         : %(cpp_os_sim)         ; \
-@@ -628,7 +636,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- 
- #undef	STARTFILE_SPEC
- #define	STARTFILE_SPEC "\
--%{mads         : %(startfile_ads)         ; \
-+%{mgcn         : %(startfile_gcn)         ; \
-+  mogc|mvgc|mgcbios         : %(startfile_ogc)         ; \
-+  mrvl         : %(startfile_ogc)         ; \
-+  mads         : %(startfile_ads)         ; \
-   myellowknife : %(startfile_yellowknife) ; \
-   mmvme        : %(startfile_mvme)        ; \
-   msim         : %(startfile_sim)         ; \
-@@ -642,7 +653,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- 
- #undef	LIB_SPEC
- #define	LIB_SPEC "\
--%{mads         : %(lib_ads)         ; \
-+%{mgcn|mogc|mvgc|mgcbios|mrvl        : %(lib_ogc)         ; \
-+  mads         : %(lib_ads)         ; \
-   myellowknife : %(lib_yellowknife) ; \
-   mmvme        : %(lib_mvme)        ; \
-   msim         : %(lib_sim)         ; \
-@@ -652,11 +664,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
-   mcall-openbsd: %(lib_openbsd)     ; \
-                : %(lib_default)     }"
- 
--#define LIB_DEFAULT_SPEC "-lc"
-+#define LIB_DEFAULT_SPEC "--start-group -lsysbase -lc --end-group"
- 
- #undef	ENDFILE_SPEC
- #define	ENDFILE_SPEC "\
--%{mads         : %(endfile_ads)         ; \
-+%{mgcn|mogc|mvgc|mgcbios|mrvl         : %(endfile_ogc)         ; \
-+  mads         : %(endfile_ads)         ; \
-   myellowknife : %(endfile_yellowknife) ; \
-   mmvme        : %(endfile_mvme)        ; \
-   msim         : %(endfile_sim)         ; \
-@@ -672,16 +685,27 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
- 
- /* Motorola ADS support.  */
- #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
-+#define LIB_OGC_SPEC "--start-group -lsysbase -lc --end-group"
- 
- #define	STARTFILE_ADS_SPEC "ecrti.o%s crt0.o%s crtbegin.o%s"
-+#define	STARTFILE_OGC_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s"
- 
- #define	ENDFILE_ADS_SPEC "crtend.o%s ecrtn.o%s"
-+#define	ENDFILE_OGC_SPEC "crtend.o%s ecrtn.o%s"
- 
- #define LINK_START_ADS_SPEC "-T ads.ld%s"
-+#define LINK_START_OGC_SPEC "-T ogc.ld%s"
-+#define LINK_START_RVL_SPEC "-T rvl.ld%s"
-+#define LINK_START_VGC_SPEC "-T vgcogc.ld%s"
-+#define LINK_START_GCB_SPEC "-T gcbogc.ld%s"
- 
- #define LINK_OS_ADS_SPEC ""
-+#define LINK_OS_OGC_SPEC "--gc-sections"
- 
- #define CPP_OS_ADS_SPEC ""
-+#define CPP_OS_GCN_SPEC "-D__gamecube__ -ffunction-sections -fdata-sections"
-+#define CPP_OS_OGC_SPEC "-D__gamecube__ -DHW_DOL -ffunction-sections -fdata-sections"
-+#define CPP_OS_RVL_SPEC "-D__wii__ -DHW_RVL -ffunction-sections -fdata-sections"
- 
- /* Motorola Yellowknife support.  */
- #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -882,6 +906,7 @@ ncrtn.o%s"
- #undef	SUBTARGET_EXTRA_SPECS
- #define	SUBTARGET_EXTRA_SPECS						\
-   { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
-+  { "lib_ogc",			LIB_OGC_SPEC },				\
-   { "lib_ads",			LIB_ADS_SPEC },				\
-   { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
-   { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -891,6 +916,7 @@ ncrtn.o%s"
-   { "lib_netbsd",		LIB_NETBSD_SPEC },			\
-   { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
-   { "lib_default",		LIB_DEFAULT_SPEC },			\
-+  { "startfile_ogc",		STARTFILE_OGC_SPEC },			\
-   { "startfile_ads",		STARTFILE_ADS_SPEC },			\
-   { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
-   { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -900,6 +926,7 @@ ncrtn.o%s"
-   { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
-   { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
-   { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
-+  { "endfile_ogc",		ENDFILE_OGC_SPEC },			\
-   { "endfile_ads",		ENDFILE_ADS_SPEC },			\
-   { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
-   { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -911,7 +938,11 @@ ncrtn.o%s"
-   { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
-   { "link_shlib",		LINK_SHLIB_SPEC },			\
-   { "link_start",		LINK_START_SPEC },			\
-+  { "link_start_vgc",		LINK_START_VGC_SPEC },			\
-+  { "link_start_gcb",		LINK_START_GCB_SPEC },			\
-+  { "link_start_rvl",		LINK_START_RVL_SPEC },			\
-   { "link_start_ads",		LINK_START_ADS_SPEC },			\
-+  { "link_start_ogc",		LINK_START_OGC_SPEC },			\
-   { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
-   { "link_start_mvme",		LINK_START_MVME_SPEC },			\
-   { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -921,6 +952,7 @@ ncrtn.o%s"
-   { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
-   { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
-   { "link_os",			LINK_OS_SPEC },				\
-+  { "link_os_ogc",		LINK_OS_OGC_SPEC },			\
-   { "link_os_ads",		LINK_OS_ADS_SPEC },			\
-   { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
-   { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -932,6 +964,9 @@ ncrtn.o%s"
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-   { "link_secure_plt",		LINK_SECURE_PLT_SPEC },			\
-+  { "cpp_os_gcn",		CPP_OS_GCN_SPEC },			\
-+  { "cpp_os_ogc",		CPP_OS_OGC_SPEC },			\
-+  { "cpp_os_rvl",		CPP_OS_RVL_SPEC },			\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "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
---- a/gcc/config/rs6000/sysv4.opt
-+++ b/gcc/config/rs6000/sysv4.opt
-@@ -124,6 +124,26 @@ mads
- Target RejectNegative
- Link with libads.a, libc.a and crt0.o.
- 
-+mgcn
-+Target RejectNegative
-+Link with libsysbase.a and libc.a, use ogc linker script 
-+
-+mogc
-+Target RejectNegative
-+Link with libsysbase.a and libc.a, use ogc linker script 
-+
-+mgcbios
-+Target RejectNegative
-+Link with libsysbase.a and libc.a, use gcbogc linker script 
-+
-+mvgc
-+Target RejectNegative
-+Link with libsysbase.a and libc.a, use gcbogc linker script 
-+
-+mrvl
-+Target RejectNegative
-+Link with libsysbase.a and libc.a, use rvl linker script 
-+
- myellowknife
- Target RejectNegative
- Link with libyk.a, libc.a and crt0.o.
-diff --git a/gcc/configure b/gcc/configure
-index 97ba7d7d69c..c0e468546ed 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
-     # default
-     target_thread_file='single'
-     ;;
--  aix | dce | lynx | mipssde | posix | rtems | \
-+  aix | dce | dkp | lynx | mipssde | posix | rtems | \
-   single | tpf | vxworks | win32)
-     target_thread_file=${enable_threads}
-     ;;
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d6f2d5b2ed0..15edac2ce9b 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1611,7 +1611,7 @@ case ${enable_threads} in
-     # default
-     target_thread_file='single'
-     ;;
--  aix | dce | lynx | mipssde | posix | rtems | \
-+  aix | dce | dkp | lynx | mipssde | posix | rtems | \
-   single | tpf | vxworks | win32)
-     target_thread_file=${enable_threads}
-     ;;
-diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
-index ba2b2623301..8d866107142 100644
---- a/libgcc/config/rs6000/crtrestvr.S
-+++ b/libgcc/config/rs6000/crtrestvr.S
-@@ -24,7 +24,7 @@
- 
- /* On PowerPC64 Linux, these functions are provided by the linker.  */
- #ifndef __powerpc64__
--
-+#if 0
- #undef __ALTIVEC__
- #define __ALTIVEC__ 1
- 	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
- CFI_ENDPROC
- 
- #endif
-+#endif
-diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
-index 077e33f34d5..b7be68b710f 100644
---- a/libgcc/config/rs6000/crtsavevr.S
-+++ b/libgcc/config/rs6000/crtsavevr.S
-@@ -24,7 +24,7 @@
- 
- /* On PowerPC64 Linux, these functions are provided by the linker.  */
- #ifndef __powerpc64__
--
-+#if 0
- #undef __ALTIVEC__
- #define __ALTIVEC__ 1
- 	#include "ppc-asm.h"
-@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
- CFI_ENDPROC
- 
- #endif
-+#endif
-diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
-new file mode 100644
-index 00000000000..94d6ba94ec0
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.c
-@@ -0,0 +1,349 @@
-+/* Threads compatibility routines for libgcc2 and libobjc.  */
-+/* Compile this one with gcc.  */
-+/* Copyright (C) 1997-2016 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/>.  */
-+
-+#include "gthr-dkp.h"
-+#include <stddef.h>
-+
-+__gthread_impl_t __gthread_impl = {
-+  NULL, // active
-+  NULL, // create
-+  NULL, // join
-+  NULL, // detach
-+  NULL, // equal
-+  NULL, // self
-+  NULL, // yield
-+  NULL, // once
-+  NULL, // key_create
-+  NULL, // key_delete
-+  NULL, // getspecific
-+  NULL, // setspecific
-+  NULL, // mutex_init_function
-+  NULL, // mutex_destroy
-+  NULL, // mutex_lock
-+  NULL, // mutex_trylock
-+  NULL, // mutex_unlock
-+  NULL, // recursive_mutex_init_function
-+  NULL, // recursive_mutex_lock
-+  NULL, // recursive_mutex_trylock
-+  NULL, // recursive_mutex_unlock
-+  NULL, // recursive_mutex_destroy
-+  NULL, // cond_init_function
-+  NULL, // cond_broadcast
-+  NULL, // cond_signal
-+  NULL, // cond_wait
-+  NULL, // cond_timedwait
-+  NULL, // cond_wait_recursive
-+  NULL, // cond_destroy
-+};
-+
-+int
-+__gthread_active_p (void)
-+{
-+  if (!__gthread_impl.active) {
-+    return 0;
-+  }
-+
-+  return __gthread_impl.active();
-+}
-+
-+int
-+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
-+                  void *__args)
-+{
-+  if (!__gthread_impl.create) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.create(__threadid, __func, __args);
-+}
-+
-+int
-+__gthread_join (__gthread_t __threadid, void **__value_ptr)
-+{
-+  if (!__gthread_impl.join) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.join(__threadid, __value_ptr);
-+}
-+
-+int
-+__gthread_detach (__gthread_t __threadid)
-+{
-+  if (!__gthread_impl.detach) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.detach(__threadid);
-+}
-+
-+int
-+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
-+{
-+  if (!__gthread_impl.equal) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.equal(__t1, __t2);
-+}
-+
-+__gthread_t
-+__gthread_self (void)
-+{
-+  if (!__gthread_impl.self) {
-+    __gthread_t result = { 0 };
-+    return result;
-+  }
-+
-+  return __gthread_impl.self();
-+}
-+
-+int
-+__gthread_yield (void)
-+{
-+  if (!__gthread_impl.yield) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.yield();
-+}
-+
-+int
-+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
-+{
-+  if (!__gthread_impl.once) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.once(__once, __func);
-+}
-+
-+int
-+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
-+{
-+  if (!__gthread_impl.key_create) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.key_create(__key, __dtor);
-+}
-+
-+int
-+__gthread_key_delete (__gthread_key_t __key)
-+{
-+  if (!__gthread_impl.key_delete) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.key_delete(__key);
-+}
-+
-+void *
-+__gthread_getspecific (__gthread_key_t __key)
-+{
-+  if (!__gthread_impl.getspecific) {
-+    return NULL;
-+  }
-+
-+  return __gthread_impl.getspecific(__key);
-+}
-+
-+int
-+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
-+{
-+  if (!__gthread_impl.setspecific) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.setspecific(__key, __ptr);
-+}
-+
-+void
-+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
-+{
-+  if (__gthread_impl.mutex_init_function) {
-+    __gthread_impl.mutex_init_function(__mutex);
-+  }
-+}
-+
-+int
-+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.mutex_destroy) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.mutex_destroy(__mutex);
-+}
-+
-+int
-+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.mutex_lock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.mutex_lock(__mutex);
-+}
-+
-+int
-+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.mutex_trylock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.mutex_trylock(__mutex);
-+}
-+
-+int
-+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.mutex_unlock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.mutex_unlock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.recursive_mutex_init_function) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.recursive_mutex_init_function(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.recursive_mutex_lock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.recursive_mutex_lock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.recursive_mutex_trylock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.recursive_mutex_trylock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.recursive_mutex_unlock) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.recursive_mutex_unlock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.recursive_mutex_destroy) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.recursive_mutex_destroy(__mutex);
-+}
-+
-+void
-+__gthread_cond_init_function (__gthread_cond_t *__cond)
-+{
-+  if (__gthread_impl.cond_init_function) {
-+    __gthread_impl.cond_init_function(__cond);
-+  }
-+}
-+
-+int
-+__gthread_cond_broadcast (__gthread_cond_t *__cond)
-+{
-+  if (!__gthread_impl.cond_broadcast) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_broadcast(__cond);
-+}
-+
-+int
-+__gthread_cond_signal (__gthread_cond_t *__cond)
-+{
-+  if (!__gthread_impl.cond_signal) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_signal(__cond);
-+}
-+
-+int
-+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.cond_wait) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_wait(__cond, __mutex);
-+}
-+
-+int
-+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                          const __gthread_time_t *__abs_timeout)
-+{
-+  if (!__gthread_impl.cond_timedwait) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_timedwait(__cond, __mutex, __abs_timeout);
-+}
-+
-+int
-+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
-+                               __gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__gthread_impl.cond_wait_recursive) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_wait_recursive(__cond, __mutex);
-+}
-+
-+int
-+__gthread_cond_destroy (__gthread_cond_t* __cond)
-+{
-+  if (!__gthread_impl.cond_destroy) {
-+    return -1;
-+  }
-+
-+  return __gthread_impl.cond_destroy(__cond);
-+}
-diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
-new file mode 100644
-index 00000000000..281c19d2a60
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.h
-@@ -0,0 +1,185 @@
-+/* Threads compatibility routines for libgcc2 and libobjc.  */
-+/* Compile this one with gcc.  */
-+/* Copyright (C) 1997-2016 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/>.  */
-+
-+#ifndef _GLIBCXX_GCC_GTHR_DKP_H
-+#define _GLIBCXX_GCC_GTHR_DKP_H
-+
-+#define __GTHREADS 1
-+#define __GTHREADS_CXX0X 1
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef void *                      __gthread_t;
-+typedef struct { int padding[7]; }  __gthread_cond_t;
-+typedef struct { int padding; }     __gthread_key_t;
-+typedef struct { int padding[11]; } __gthread_mutex_t;
-+typedef struct { int padding; }     __gthread_once_t;
-+typedef struct { int padding[11]; } __gthread_recursive_mutex_t;
-+typedef struct timespec             __gthread_time_t;
-+
-+#define __GTHREAD_HAS_COND 1
-+#define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
-+
-+#define __GTHREAD_ONCE_INIT { 0 }
-+#define __GTHREAD_TIME_INIT { 0, 0 }
-+
-+#define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function
-+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
-+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-+
-+typedef struct {
-+  int (*active) (void);
-+  int (*create) (__gthread_t *__threadid, void *(*__func) (void*),
-+                 void *__args);
-+  int (*join) (__gthread_t __threadid, void **__value_ptr);
-+  int (*detach) (__gthread_t __threadid);
-+  int (*equal) (__gthread_t __t1, __gthread_t __t2);
-+  __gthread_t (*self) (void);
-+  int (*yield) (void);
-+  int (*once) (__gthread_once_t *__once, void (*__func) (void));
-+  int (*key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
-+  int (*key_delete) (__gthread_key_t __key);
-+  void * (*getspecific) (__gthread_key_t __key);
-+  int (*setspecific) (__gthread_key_t __key, const void *__ptr);
-+  void (*mutex_init_function) (__gthread_mutex_t *__mutex);
-+  int (*mutex_destroy) (__gthread_mutex_t *__mutex);
-+  int (*mutex_lock) (__gthread_mutex_t *__mutex);
-+  int (*mutex_trylock) (__gthread_mutex_t *__mutex);
-+  int (*mutex_unlock) (__gthread_mutex_t *__mutex);
-+  int (*recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
-+  int (*recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
-+  void (*cond_init_function) (__gthread_cond_t *__cond);
-+  int (*cond_broadcast) (__gthread_cond_t *__cond);
-+  int (*cond_signal) (__gthread_cond_t *__cond);
-+  int (*cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
-+  int (*cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                         const __gthread_time_t *__abs_timeout);
-+  int (*cond_wait_recursive) (__gthread_cond_t *__cond,
-+                              __gthread_recursive_mutex_t *__mutex);
-+  int (*cond_destroy) (__gthread_cond_t* __cond);
-+} __gthread_impl_t;
-+
-+extern __gthread_impl_t __gthread_impl;
-+
-+int
-+__gthread_active_p (void);
-+
-+int
-+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
-+                  void *__args);
-+
-+int
-+__gthread_join (__gthread_t __threadid, void **__value_ptr);
-+
-+int
-+__gthread_detach (__gthread_t __threadid);
-+
-+int
-+__gthread_equal (__gthread_t __t1, __gthread_t __t2);
-+
-+__gthread_t
-+__gthread_self (void);
-+
-+int
-+__gthread_yield (void);
-+
-+int
-+__gthread_once (__gthread_once_t *__once, void (*__func) (void));
-+
-+int
-+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *));
-+
-+int
-+__gthread_key_delete (__gthread_key_t __key);
-+
-+void *
-+__gthread_getspecific (__gthread_key_t __key);
-+
-+int
-+__gthread_setspecific (__gthread_key_t __key, const void *__ptr);
-+
-+void
-+__gthread_mutex_init_function (__gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_mutex_destroy (__gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_mutex_lock (__gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_mutex_trylock (__gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_mutex_unlock (__gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex);
-+
-+int
-+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex);
-+
-+int
-+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex);
-+
-+int
-+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex);
-+
-+int
-+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex);
-+
-+void
-+__gthread_cond_init_function (__gthread_cond_t *__cond);
-+
-+int
-+__gthread_cond_broadcast (__gthread_cond_t *__cond);
-+
-+int
-+__gthread_cond_signal (__gthread_cond_t *__cond);
-+
-+int
-+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
-+
-+int
-+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                          const __gthread_time_t *__abs_timeout);
-+
-+int
-+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
-+                               __gthread_recursive_mutex_t *__mutex);
-+
-+int
-+__gthread_cond_destroy (__gthread_cond_t* __cond);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
-diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
-index fb812d3801f..7f6669d530f 100644
---- a/libgcc/config/rs6000/t-ppccomm
-+++ b/libgcc/config/rs6000/t-ppccomm
-@@ -1,4 +1,5 @@
- LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
-+	   $(srcdir)/config/rs6000/gthr-dkp.c \
- 	   $(srcdir)/config/rs6000/tramp.S
- 
- # This can't end up in shared libgcc
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..c6f93f8b3ac 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
- 
- case $target_thread_file in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-     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
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- /* Target machine header files require this define. */
- #define IN_LIBGCC2
-+#define USED_FOR_TARGET
- 
- /* FIXME: Including auto-host is incorrect, but until we have
-    identified the set of defines that need to go into auto-target.h,
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 61457e940ec..a7c63407ced 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15382,6 +15382,7 @@ $as_echo "$target_thread_file" >&6; }
- 
- case $target_thread_file in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-+    dkp)	thread_header=config/rs6000/gthr-dkp.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-     lynx)	thread_header=config/gthr-lynx.h ;;
-     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;

dkppc/patches/gdb-8.2.1.patch

@@ -1,60 +0,0 @@
-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.  */
- 

dkppc/scripts/build-crtls.sh

@@ -4,14 +4,13 @@
 # set env variables
 #---------------------------------------------------------------------------------
 export DEVKITPRO=$TOOLPATH
-export DEVKITARM=$DEVKITPRO/devkitARM
+export DEVKITPPC=$DEVKITPRO/devkitPPC
 
 #---------------------------------------------------------------------------------
 # Install the rules files
 #---------------------------------------------------------------------------------
 cd $BUILDDIR
 
-mkdir -p rules
+tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.gz
-cd rules
+cd devkitppc-rules-$DKPPC_RULES_VER
-tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
+$MAKE install
-make install

dkppc/scripts/build-gcc.sh

@@ -12,7 +12,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
+	../../binutils-$BINUTILS_VER/configure \
 	--prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \
 	--disable-werror \
 	--enable-poison-system-directories \
@@ -40,12 +40,15 @@ cd $BUILDDIR
 # build and install mn10200 binutils
 #---------------------------------------------------------------------------------
 
+# Use modern config.sub for aarch64 host
+cp binutils-$BINUTILS_VER/config.sub binutils-$MN_BINUTILS_VER/config.sub
+
 mkdir -p mn10200/binutils
 cd mn10200/binutils
 
 if [ ! -f configured-binutils ]
 then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$MN_BINUTILS_VER/configure \
+	../../binutils-$MN_BINUTILS_VER/configure \
 	--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
 	--disable-multilib \
 	--disable-werror $CROSS_PARAMS \
@@ -73,11 +76,10 @@ cd $BUILDDIR
 mkdir -p $target/gcc
 cd $target/gcc
 
+export gcc_cv_libc_provides_ssp=yes
+
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" \
-	CXXFLAGS="$cflags" \
-	LDFLAGS="$ldflags" \
 	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	LDFLAGS_FOR_TARGET="" \
@@ -91,15 +93,18 @@ then
 	--disable-libstdcxx-verbose \
 	--enable-libstdcxx-time=yes \
 	--enable-libstdcxx-filesystem-ts \
+	--disable-tm-clone-registry \
+	--disable-__cxa_atexit \
+	--disable-libssp \
 	--enable-cxx-flags='-ffunction-sections -fdata-sections' \
 	--target=$target \
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
-	--prefix=$prefix\
+	--prefix=$prefix \
-	--with-system-zlib\
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 47" \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 36" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
+	$EXTRA_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
 	|| { echo "Error configuring gcc stage 1"; exit 1; }
 	touch configured-gcc
@@ -134,11 +139,12 @@ unset CXX
 
 if [ ! -f configured-newlib ]
 then
-	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
+	CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections -DCUSTOM_MALLOC_LOCK" \
 	../../newlib-$NEWLIB_VER/configure \
 	--target=$target \
 	--prefix=$prefix \
 	--enable-newlib-mb \
+	--enable-newlib-register-fini \
 	|| { echo "Error configuring newlib"; exit 1; }
 	touch configured-newlib
 fi
@@ -187,31 +193,3 @@ echo "installing linkscripts ..."
 cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
 
 cd $BUILDDIR
-
-#---------------------------------------------------------------------------------
-# build and install the debugger
-#---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-if [ ! -f configured-gdb ]
-then
-	CFLAGS="$cflags" LDFLAGS="$ldflags" ../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS \
-	$CROSS_GCC_PARAMS || { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
-

select_toolchain.sh

@@ -30,31 +30,28 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=10.1.0
+    GCC_VER=15.1.0
-    BINUTILS_VER=2.32
+    BINUTILS_VER=2.44
-    NEWLIB_VER=3.3.0
+    NEWLIB_VER=4.5.0.20241231
-    GDB_VER=8.2.1
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=8.4.0
+    GCC_VER=15.1.0
-    BINUTILS_VER=2.32
+    BINUTILS_VER=2.44
-    MN_BINUTILS_VER=2.17
+    MN_BINUTILS_VER=2.24
-    NEWLIB_VER=3.3.0
+    NEWLIB_VER=4.5.0.20241231
-    GDB_VER=8.2.1
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=10.1.0
+    GCC_VER=14.2.0
-    BINUTILS_VER=2.32
+    BINUTILS_VER=2.43.1
-    NEWLIB_VER=3.3.0
+    NEWLIB_VER=4.4.0.20231231
-    GDB_VER=9.1
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf