devkitPPC: r45.2

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/
-http://www.mpfr.org/
-http://www.multiprecision.org/
+https://gmplib.org/
+https://www.mpfr.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/
-http://www.zlib.net
-http://www.libusb.org
-http://expat.sourceforge.net/
+https://freeimage.sourceforge.net/
+https://www.zlib.net
+https://www.libusb.org
+https://expat.sourceforge.net/
 
 sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
 

build-devkit.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 57
-#	devkitPPC release 40
-#	devkitA64 release 18
+#	devkitARM release 63
+#	devkitPPC release 45.2
+#	devkitA64 release 25.1
 #---------------------------------------------------------------------------------
 
 if [ 0 -eq 1 ] ; then
@@ -27,12 +27,12 @@ echo
 
 
 
-DKARM_RULES_VER=1.2.1
-DKARM_CRTLS_VER=1.1.1
+DKARM_RULES_VER=1.5.0
+DKARM_CRTLS_VER=1.2.2
 
-DKPPC_RULES_VER=1.1.0
+DKPPC_RULES_VER=1.2.1
 
-DKA64_RULES_VER=1.0.1
+DKA64_RULES_VER=1.1.1
 
 OSXMIN=${OSXMIN:-10.9}
 
@@ -72,20 +72,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
 #---------------------------------------------------------------------------------
-
-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
+INSTALLDIR=/opt/devkitpro
 
 [ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1;
 

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

dka64/patches/binutils-2.41.patch

@@ -1,15 +1,15 @@
 diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
-index 5741c60264..fb5d9d069c 100644
+index ec856764519..436098cbcc2 100644
 --- a/bfd/elf-bfd.h
 +++ b/bfd/elf-bfd.h
-@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
+@@ -1966,6 +1966,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 d38e0afff2e..372e6615931 100644
 --- a/bfd/elf.c
 +++ b/bfd/elf.c
-@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
+@@ -7321,6 +7321,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)
-     return (*t->o->build_id.after_write_object_contents) (abfd);
+   if (t->o->build_id.after_write_object_contents != NULL
+       && !(*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 4592bd6da27..dc27042cfe2 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,
+@@ -6916,11 +6922,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;
-+      bfd_boolean resolved_to_zero = FALSE;
+       bool unresolved_reloc = 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,
+@@ -7060,6 +7068,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,
+@@ -7083,7 +7095,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,
+@@ -7178,7 +7190,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,
+@@ -7227,7 +7239,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)
-   return FALSE;
+@@ -7553,6 +7565,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
+   return false;
  }
  
 +/* Remove undefined weak symbol from the dynamic symbol table if it
 +   is resolved to 0.   */
 +
-+extern bfd_boolean
-+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
-+
-+bfd_boolean
++static bool
 +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)
+@@ -8771,6 +8800,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)
+@@ -8790,6 +8820,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)
+@@ -8799,7 +8833,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)
+@@ -8833,6 +8867,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)
+@@ -8861,6 +8900,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)
+@@ -8873,9 +8913,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;
-@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+       bool dyn;
+@@ -8887,7 +8924,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)
+@@ -8901,7 +8938,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)
+@@ -8937,7 +8974,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)
+@@ -9019,7 +9056,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)
+@@ -9039,7 +9076,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)
+@@ -9050,6 +9089,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
  	     Undefined weak syms won't yet be marked as dynamic.  */
  	  if (h->dynindx == -1
  	      && !h->forced_local
 +	      && !resolved_to_zero
  	      && h->root.type == bfd_link_hash_undefweak
  	      && !bfd_elf_link_record_dynamic_symbol (info, h))
- 	    return FALSE;
-@@ -9163,8 +9206,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+ 	    return false;
+@@ -9607,8 +9647,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,
- 	return FALSE;
+@@ -9643,7 +9692,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+ 	return false;
  
        elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
 -      if (!h->def_regular)
@@ -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,
-     }
- 
-   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 
+@@ -9665,7 +9714,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+       && 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 =
+@@ -10312,6 +10362,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 8f68e517b45..260a590e69e 100644
 --- a/ld/emulparams/aarch64elf.sh
 +++ b/ld/emulparams/aarch64elf.sh
 @@ -1,3 +1,5 @@
-+. ${srcdir}/emulparams/dynamic_undefined_weak.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 5a08d9e29f1..e4c9abf85a1 100644
 --- a/ld/emulparams/aarch64elf32.sh
 +++ b/ld/emulparams/aarch64elf32.sh
 @@ -1,3 +1,5 @@
-+. ${srcdir}/emulparams/dynamic_undefined_weak.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 d47bdbf9937..b6f76d5c8d7 100644
 --- a/ld/emultempl/aarch64elf.em
 +++ b/ld/emultempl/aarch64elf.em
-@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
+@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
    { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
  '
  
@@ -388,25 +322,63 @@ 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
-index f4f7ad6b4e..8428a54697 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -192,6 +192,9 @@ static char *depaudit; /* colon (typically) separated list of libs */
- /* Style of .note.gnu.build-id section.  */
- static const char *emit_note_gnu_build_id;
+diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
+index 3f67f8b09d9..eb8e8e1596e 100644
+--- a/ld/emultempl/elf.em
++++ b/ld/emultempl/elf.em
+@@ -572,6 +572,7 @@ enum elf_options
+   OPTION_EXCLUDE_LIBS,
+   OPTION_HASH_STYLE,
+   OPTION_BUILD_ID,
++  OPTION_NX_MODULE_NAME,
+   OPTION_PACKAGE_METADATA,
+   OPTION_AUDIT,
+   OPTION_COMPRESS_DEBUG
+@@ -603,6 +604,7 @@ EOF
+ fi
+ 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},
+ EOF
+@@ -673,6 +675,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 (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 f9a6819366f..99e982ef5eb 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
-    shared library linked against different versions of libc.  The
-    dynamic linker somehow tags which libc version to use in
-@@ -1217,6 +1220,92 @@ setup_build_id (bfd *ibfd)
-   return FALSE;
+ /* These variables are required to pass information back and forth
+    between after_open and check_needed and stat_needed and vercheck.  */
+ 
+@@ -1206,8 +1209,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
+   *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 +388,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;
 +
@@ -450,21 +422,21 @@ index f4f7ad6b4e..8428a54697 100644
 +
 +/* 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);
-+      emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
-+      emit_nx_module_name = xstrdup (emit_nx_module_name);
-+      dot_pos = strrchr (emit_nx_module_name, '.');
++      free ((char *) ldelf_emit_nx_module_name);
++      ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
++      ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
++      dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
 +      if (dot_pos != NULL)
 +        {
 +          /* Remove extension. */
@@ -472,34 +444,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.  */
- 
- static void
-@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
++/* This is called before calling plugin 'all symbols read' hook.  */
+ void
+ ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
+ 				      int is_linux, int is_freebsd,
+@@ -1286,6 +1374,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 +485,23 @@ 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);
-+          emit_nx_module_name = NULL;
++          free ((char *) ldelf_emit_nx_module_name);
++          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))
-@@ -2720,6 +2827,7 @@ enum elf_options
-   OPTION_EXCLUDE_LIBS,
-   OPTION_HASH_STYLE,
-   OPTION_BUILD_ID,
-+  OPTION_NX_MODULE_NAME,
-   OPTION_AUDIT,
-   OPTION_COMPRESS_DEBUG
- };
-@@ -2750,6 +2858,7 @@ EOF
- fi
- fragment <<EOF
-     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
-+    {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
-     {"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
- EOF
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
-@@ -2814,6 +2923,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
- 	einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
- 	       optarg);
-       break;
-+    case OPTION_NX_MODULE_NAME:
-+      if (emit_nx_module_name != NULL)
-+        {
-+          free ((char *) emit_nx_module_name);
-+          emit_nx_module_name = NULL;
-+        }
-+      if (optarg == NULL)
-+        optarg = "";
-+      emit_nx_module_name = xstrdup (optarg);
-+      break;
- EOF
+   /* Do not allow executable files to be used as inputs to the link.  */
+diff --git a/ld/ldelf.h b/ld/ldelf.h
+index f82bd9234a7..96173dcd671 100644
+--- a/ld/ldelf.h
++++ b/ld/ldelf.h
+@@ -20,6 +20,7 @@
  
- 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;
- 		}
- 	;
+ 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;
  
-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 ();
+ extern void ldelf_after_parse (void);
+ extern bool ldelf_load_symbols (lang_input_statement_type *);

dka64/patches/binutils-2.42.patch

@@ -0,0 +1,507 @@
+diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
+index 3ed22fa6c52..16cec309746 100644
+--- a/bfd/elf-bfd.h
++++ b/bfd/elf-bfd.h
+@@ -1984,6 +1984,14 @@ struct output_elf_obj_tdata
+     asection *sec;
+   } package_metadata;
+ 
++  /* Data for .nx-module-name. */
++  struct
++  {
++    bool (*after_write_object_contents) (bfd *);
++    const char *name;
++    asection *sec;
++  } nx_module_name;
++
+   /* Records the result of `get_program_header_size'.  */
+   bfd_size_type program_header_size;
+ 
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 88c75ae3ce0..c4b5cda59a7 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -7359,6 +7359,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
+   if (!bed->s->write_shdrs_and_ehdr (abfd))
+     return false;
+ 
++  /* Write out the NX module name. */
++  if (t->o->nx_module_name.after_write_object_contents != NULL)
++    {
++      failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
++      if (failed)
++        return false;
++    }
++
+   /* This is last since write_shdrs_and_ehdr can touch i_shdrp[0].  */
+   if (t->o->build_id.after_write_object_contents != NULL
+       && !(*t->o->build_id.after_write_object_contents) (abfd))
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index 109517db4aa..36ea8726544 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
+   aarch64_stub_erratum_843419_veneer,
+ };
+ 
++/* Is an undefined weak symbol resolved to 0 ? */
++#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH)               \
++  ((EH)->root.root.type == bfd_link_hash_undefweak              \
++   && bfd_link_executable (INFO)                                \
++   && !(INFO)->dynamic_undefined_weak)
++
+ struct elf_aarch64_stub_hash_entry
+ {
+   /* Base hash table entry structure.  */
+@@ -6947,11 +6953,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+       Elf_Internal_Sym *sym;
+       asection *sec;
+       struct elf_link_hash_entry *h;
++      struct elf_aarch64_link_hash_entry *eh;
+       bfd_vma relocation;
+       bfd_reloc_status_type r;
+       arelent bfd_reloc;
+       char sym_type;
+       bool unresolved_reloc = false;
++      bool resolved_to_zero = false;
+       char *error_message = NULL;
+ 
+       r_symndx = ELFNN_R_SYM (rel->r_info);
+@@ -7091,6 +7099,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+ 					       h, &unresolved_reloc,
+ 					       save_addend, &addend, sym);
+ 
++      eh = (struct elf_aarch64_link_hash_entry *) h;
++      resolved_to_zero = (eh != NULL
++                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
++
+       switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
+ 	{
+ 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
+@@ -7114,7 +7126,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -7209,7 +7221,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -7258,7 +7270,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
+ 	      bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
+ 
+ 	      need_relocs = (h == NULL
+-			     || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++			     || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 			     || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -7584,6 +7596,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
+   return false;
+ }
+ 
++/* Remove undefined weak symbol from the dynamic symbol table if it
++   is resolved to 0.   */
++
++static bool
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
++                             struct elf_link_hash_entry *h)
++{
++  if (h->dynindx != -1
++      && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
++    {
++      h->dynindx = -1;
++      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
++                              h->dynstr_index);
++    }
++  return true;
++}
++
+ /* Adjust a symbol defined by a dynamic object and referenced by a
+    regular object.  The current definition is in some section of the
+    dynamic object, but we're not including those sections.  We have to
+@@ -8802,6 +8831,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;
++  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)
+@@ -8821,6 +8851,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+   info = (struct bfd_link_info *) inf;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
++  resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+      here if it is defined and referenced in a non-shared object.  */
+   if (h->type == STT_GNU_IFUNC
+@@ -8830,7 +8864,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+     {
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (h->dynindx == -1 && !h->forced_local
++      if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8864,6 +8898,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 += htab->plt_entry_size;
+ 
++          /* There should be no PLT relocations against resolved undefined
++             weak symbols in the executable.  */
++          if (!resolved_to_zero)
++            {
++
+ 	  /* We also need to make an entry in the .got.plt section, which
+ 	     will be placed in the .got section by the linker script.  */
+ 	  htab->root.sgotplt->size += GOT_ENTRY_SIZE;
+@@ -8892,6 +8931,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	    htab->variant_pcs = 1;
+ 
+ 	}
++	}
+       else
+ 	{
+ 	  h->plt.offset = (bfd_vma) - 1;
+@@ -8904,9 +8944,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+       h->needs_plt = 0;
+     }
+ 
+-  eh = (struct elf_aarch64_link_hash_entry *) h;
+-  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
+-
+   if (h->got.refcount > 0)
+     {
+       bool dyn;
+@@ -8918,7 +8955,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (dyn && h->dynindx == -1 && !h->forced_local
++      if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8932,7 +8969,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	{
+ 	  h->got.offset = htab->root.sgot->size;
+ 	  htab->root.sgot->size += GOT_ENTRY_SIZE;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (bfd_link_pic (info)
+ 		  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
+@@ -8968,7 +9005,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	    }
+ 
+ 	  indx = h && h->dynindx != -1 ? h->dynindx : 0;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (!bfd_link_executable (info)
+ 		  || indx != 0
+@@ -9050,7 +9087,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	 visibility.  */
+       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))
+ 	    h->dyn_relocs = NULL;
+ 
+@@ -9070,7 +9107,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 	 symbols which turn out to need copy relocs or are not
+ 	 dynamic.  */
+ 
+-      if (!h->non_got_ref
++      if (!(h->non_got_ref
++           || (h->root.type == bfd_link_hash_undefweak
++               && !resolved_to_zero))
+ 	  && ((h->def_dynamic
+ 	       && !h->def_regular)
+ 	      || (htab->root.dynamic_sections_created
+@@ -9081,6 +9120,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;
+@@ -9638,8 +9678,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;
++  bool local_undefweak;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++
++  /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
++     resolved undefined weak symbols in executable so that their
++     references have value 0 at run-time.  */
++  local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   if (h->plt.offset != (bfd_vma) - 1)
+     {
+       asection *plt, *gotplt, *relplt;
+@@ -9674,7 +9723,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+ 	return false;
+ 
+       elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
+-      if (!h->def_regular)
++      if (!local_undefweak && !h->def_regular)
+ 	{
+ 	  /* Mark the symbol as undefined, rather than as defined in
+ 	     the .plt section.  */
+@@ -9696,7 +9745,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
+       && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
+       /* Undefined weak symbol in static PIE resolves to 0 without
+ 	 any dynamic relocations.  */
+-      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
++      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
++      && !local_undefweak)
+     {
+       Elf_Internal_Rela rela;
+       bfd_byte *loc;
+@@ -10343,6 +10393,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
+ #define elf_backend_init_index_section		\
+   _bfd_elf_init_2_index_sections
+ 
++#define elf_backend_fixup_symbol		\
++  elfNN_aarch64_elf_fixup_symbol
++
+ #define elf_backend_finish_dynamic_sections	\
+   elfNN_aarch64_finish_dynamic_sections
+ 
+diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
+index 8f68e517b45..260a590e69e 100644
+--- a/ld/emulparams/aarch64elf.sh
++++ b/ld/emulparams/aarch64elf.sh
+@@ -1,3 +1,5 @@
++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 5a08d9e29f1..e4c9abf85a1 100644
+--- a/ld/emulparams/aarch64elf32.sh
++++ b/ld/emulparams/aarch64elf32.sh
+@@ -1,3 +1,5 @@
++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 b647909ae63..3e2d7a171b9 100644
+--- a/ld/emultempl/aarch64elf.em
++++ b/ld/emultempl/aarch64elf.em
+@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
+   { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
+ '
+ 
+-PARSE_AND_LIST_OPTIONS='
++PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
+   fprintf (file, _("  --no-enum-size-warning      Don'\''t warn about objects with incompatible\n"
+ 		   "                                enum sizes\n"));
+   fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible\n"
+diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
+index 71cec19fdc6..3fd0585dee6 100644
+--- a/ld/emultempl/elf.em
++++ b/ld/emultempl/elf.em
+@@ -574,6 +574,7 @@ enum elf_options
+   OPTION_EXCLUDE_LIBS,
+   OPTION_HASH_STYLE,
+   OPTION_BUILD_ID,
++  OPTION_NX_MODULE_NAME,
+   OPTION_PACKAGE_METADATA,
+   OPTION_AUDIT,
+   OPTION_COMPRESS_DEBUG
+@@ -605,6 +606,7 @@ EOF
+ fi
+ 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},
+ EOF
+@@ -675,6 +677,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 (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 2852851dcd5..0b1efa9675a 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. */
++const char *ldelf_emit_nx_module_name;
++
+ /* These variables are required to pass information back and forth
+    between after_open and check_needed and stat_needed and vercheck.  */
+ 
+@@ -1209,8 +1212,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
+   *save_input_bfd_tail = NULL;
+ }
+ 
+-/* 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);
++  const char *name;
++  asection *asec;
++  Elf_Internal_Shdr *i_shdr;
++  unsigned char *contents;
++  bfd_size_type size;
++  file_ptr position;
+ 
++  name = t->o->nx_module_name.name;
++  asec = t->o->nx_module_name.sec;
++  if (bfd_is_abs_section (asec->output_section))
++    {
++      einfo (_("%P: warning: .nx-module-name section discarded,"
++	       " --build-id ignored\n"));
++      return true;
++    }
++  i_shdr = &elf_section_data (asec->output_section)->this_hdr;
++
++  if (i_shdr->contents == NULL)
++    {
++      if (asec->contents == NULL)
++	asec->contents = (unsigned char *) xmalloc (asec->size);
++      contents = asec->contents;
++    }
++  else
++    contents = i_shdr->contents + asec->output_offset;
++
++  size = asec->size;
++  bfd_h_put_32 (abfd, 0, &contents[0]);
++  bfd_h_put_32 (abfd, size - 9, &contents[4]);
++  memcpy (&contents[8], name, size - 9);
++  contents[size - 1] = 0; /* ensure null termination for AMS */
++
++  position = i_shdr->sh_offset + asec->output_offset;
++
++  return (bfd_seek (abfd, position, SEEK_SET) == 0
++	  && bfd_write (contents, size, abfd) == size);
++}
++
++/* Make .nx-module-name section, and set up elf_tdata->nx_module_name.  */
++
++static bool
++setup_nx_module_name (bfd *ibfd, bfd *obfd)
++{
++  asection *s;
++  bfd_size_type size;
++  flagword flags;
++
++  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 *) ldelf_emit_nx_module_name);
++      ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
++      ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
++      dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
++      if (dot_pos != NULL)
++        {
++          /* Remove extension. */
++          *dot_pos = 0;
++        }
++    }
++
++  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 (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 = ldelf_emit_nx_module_name;
++      t->o->nx_module_name.sec = s;
++      elf_section_type (s) = SHT_PROGBITS;
++      s->size = size;
++      return true;
++    }
++
++  einfo (_("%P: warning: cannot create .nx-module-name section,"
++	   " --nx-module-name ignored\n"));
++  return false;
++}
++
++/* This is called before calling plugin 'all symbols read' hook.  */
+ void
+ ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
+ 				      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 (ldelf_emit_nx_module_name != NULL)
++    {
++      /* Find an ELF input.  */
++      for (abfd = link_info.input_bfds;
++        abfd != (bfd *) NULL; abfd = abfd->link.next)
++        if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
++            && bfd_count_sections (abfd) != 0
++            && !((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
++          break;
++
++      /* If there are no ELF input files do not try to create a .nx-module-name section. */
++      if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
++        {
++          free ((char *) ldelf_emit_nx_module_name);
++          ldelf_emit_nx_module_name = NULL;
++        }
++    }
++
+   get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
+ 
+   /* Do not allow executable files to be used as inputs to the link.  */
+diff --git a/ld/ldelf.h b/ld/ldelf.h
+index 239194772c4..68516dbf45e 100644
+--- 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 *);

dka64/patches/gcc-13.2.0.patch

@@ -1,8 +1,8 @@
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 357b0bed067..6b1e254785a 100644
+index 648b3dc2110..ed605b28956 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -1090,7 +1090,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
+@@ -1132,7 +1132,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
  	tmake_file="${tmake_file} aarch64/t-aarch64"
  	case $target in
  	aarch64-*-elf*)
@@ -17,23 +17,8 @@ index 357b0bed067..6b1e254785a 100644
  		;;
          aarch64-*-fuchsia*)
                  tm_file="${tm_file} fuchsia.h"
-diff --git a/gcc/config.host b/gcc/config.host
-index 0a02c33cc80..38f7adc655e 100644
---- a/gcc/config.host
-+++ b/gcc/config.host
-@@ -251,6 +251,10 @@ case ${host} in
-     host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
-     host_lto_plugin_soname=liblto_plugin.dll
-     ;;
-+  aarch64-*-darwin*)
-+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
-+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
-+    ;;
-   i[34567]86-*-darwin* | x86_64-*-darwin*)
-     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
-     host_xmake_file="${host_xmake_file} i386/x-darwin"
 diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
-index e986149e400..9264d53f32c 100644
+index ec45f23fa41..a208eabd806 100644
 --- a/gcc/config/aarch64/aarch64-elf-raw.h
 +++ b/gcc/config/aarch64/aarch64-elf-raw.h
 @@ -22,6 +22,7 @@
@@ -45,10 +30,10 @@ index e986149e400..9264d53f32c 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 af3b7364a74..6df7a0dc8a1 100644
+index a9f3e2715ca..0c7304e1d81 100644
 --- a/gcc/config/aarch64/aarch64-opts.h
 +++ b/gcc/config/aarch64/aarch64-opts.h
-@@ -48,6 +48,12 @@ enum aarch64_tls_type {
+@@ -52,6 +52,12 @@ enum aarch64_tls_type {
    TLS_DESCRIPTORS
  };
  
@@ -61,11 +46,11 @@ index af3b7364a74..6df7a0dc8a1 100644
  /* 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 c2f4b27f6e4..ec05f056568 100644
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -18053,8 +18053,24 @@ aarch64_load_tp (rtx target)
+diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
+index f5db5379543..f582e5a7543 100644
+--- a/gcc/config/aarch64/aarch64.cc
++++ b/gcc/config/aarch64/aarch64.cc
+@@ -19550,8 +19550,24 @@ aarch64_load_tp (rtx target)
        || !register_operand (target, Pmode))
      target = gen_reg_rtx (Pmode);
  
@@ -93,10 +78,10 @@ index c2f4b27f6e4..ec05f056568 100644
  }
  
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index bfffbcd6abf..814de8c2918 100644
+index 73b09e20508..ad62b5080cc 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
-@@ -1191,6 +1191,10 @@ typedef struct
+@@ -1154,6 +1154,10 @@ typedef struct
  /* Check TLS Descriptors mechanism is selected.  */
  #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
  
@@ -107,20 +92,11 @@ index bfffbcd6abf..814de8c2918 100644
  extern enum aarch64_code_model aarch64_cmodel;
  
  /* When using the tiny addressing model conditional and unconditional branches
-@@ -1236,7 +1240,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
- #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
-   { "rewrite_mcpu", aarch64_rewrite_mcpu },
- 
--#if defined(__aarch64__)
-+#if 0 // defined(__aarch64__)
- extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define HAVE_LOCAL_CPU_DETECT
- # define EXTRA_SPEC_FUNCTIONS						\
 diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index aef6da9732d..1cbffec5ef8 100644
+index 36d0bb3f718..cfa2f7efc7f 100644
 --- a/gcc/config/aarch64/aarch64.md
 +++ b/gcc/config/aarch64/aarch64.md
-@@ -6772,11 +6772,22 @@
+@@ -7068,11 +7068,22 @@
  (define_insn "aarch64_load_tp_hard"
    [(set (match_operand:DI 0 "register_operand" "=r")
  	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -146,10 +122,10 @@ index aef6da9732d..1cbffec5ef8 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 32191cf1acf..49b03937bdd 100644
+index 1d7967db9c0..17870f18b8b 100644
 --- a/gcc/config/aarch64/aarch64.opt
 +++ b/gcc/config/aarch64/aarch64.opt
-@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
+@@ -128,6 +128,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
  EnumValue
  Enum(aarch64_tls_size) String(48) Value(48)
  
@@ -171,7 +147,7 @@ index 32191cf1acf..49b03937bdd 100644
  march=
  Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
  Use features of architecture ARCH.
-@@ -260,7 +275,7 @@ TargetVariable
+@@ -266,7 +281,7 @@ TargetVariable
  long aarch64_stack_protector_guard_offset = 0
  
  moutline-atomics
@@ -180,49 +156,11 @@ index 32191cf1acf..49b03937bdd 100644
  Generate local calls to out-of-line atomic operations.
  
  -param=aarch64-sve-compare-costs=
-diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
-new file mode 100644
-index 00000000000..92c38b0b9db
---- /dev/null
-+++ b/gcc/config/aarch64/host-aarch64-darwin.c
-@@ -0,0 +1,32 @@
-+/* i386-darwin host-specific hook definitions.
-+   Copyright (C) 2003-2021 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/>.  */
-+
-+#define IN_TARGET_CODE 1
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
-+#include "config/host-darwin.h"
-+
-+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
-+   to include config/host-darwin.h.  */
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
 diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
-index 7e1606c47ac..3b650075724 100644
+index a9a244ab6d6..a29f2772d63 100644
 --- a/gcc/config/aarch64/t-aarch64
 +++ b/gcc/config/aarch64/t-aarch64
-@@ -165,8 +165,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
+@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
  		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
  
  comma=,
@@ -235,21 +173,12 @@ index 7e1606c47ac..3b650075724 100644
  
  insn-conditions.md: s-check-sve-md
  s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
-diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
-new file mode 100644
-index 00000000000..6d788d5e89c
---- /dev/null
-+++ b/gcc/config/aarch64/x-darwin
-@@ -0,0 +1,3 @@
-+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
-+	$(COMPILE) $<
-+	$(POSTCOMPILE)
 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.
 +
@@ -278,6 +207,7 @@ index 00000000000..11ba0f5ab1c
 +#define TARGET_OS_CPP_BUILTINS()                \
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
++        builtin_define ("__DEVKITPRO__");       \
 +    } while (0)
 +
 +
@@ -316,27 +246,27 @@ 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
-index 360a280b23a..2c03947999a 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -45,7 +45,11 @@ 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?  */
+diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
+index acff6138d63..8dc91b75f93 100644
+--- a/gcc/config/i386/host-mingw32.cc
++++ b/gcc/config/i386/host-mingw32.cc
+@@ -93,7 +93,10 @@ mingw32_gt_pch_get_address (size_t size, int)
+      for NT system dlls is in 0x70000000 to 0x78000000 range.
+      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__
-+static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
-+#else
- static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
++  size  = UINT64_C(64 * 1024 * 1024 * 1024);
 +#endif
- 
- /* Granularity for reserving address space.  */
- static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4d790f9dd4a..10f0d08524c 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
+   res = VirtualAlloc (NULL, size,
+ 		      MEM_RESERVE | MEM_TOP_DOWN,
+ 		      PAGE_NOACCESS);
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 16bb07f2cdc..22a181a3a1c 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -868,6 +868,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -348,7 +278,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1191,6 +1196,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;
@@ -356,7 +286,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] =
+@@ -1701,6 +1707,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),
@@ -365,10 +295,10 @@ index 4d790f9dd4a..10f0d08524c 100644
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 675930db043..bdfd6f6b0bb 100644
+index 93ff5b81dc5..20c0fe89a28 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@ register_tm_clones (void)
+@@ -326,7 +326,7 @@ register_tm_clones (void)
  
  #ifdef OBJECT_FORMAT_ELF
  
@@ -378,7 +308,7 @@ index 675930db043..bdfd6f6b0bb 100644
     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 cca3f294b7b..deffea4107b 100644
+index 1989c0c86ed..f1c49b2d4b1 100644
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -391,10 +321,10 @@ index cca3f294b7b..deffea4107b 100644
  #define GTHREAD_USE_WEAK 0
  #endif
 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
-index 40a41ef2a1c..4d06c6f9953 100644
+index a880e8ee227..c58249f986c 100644
 --- a/libstdc++-v3/include/Makefile.am
 +++ b/libstdc++-v3/include/Makefile.am
-@@ -1347,6 +1347,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1417,6 +1417,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' \
@@ -403,10 +333,10 @@ index 40a41ef2a1c..4d06c6f9953 100644
  	    < $< > $@
  
 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index fcd2b5b2d40..c034367994a 100644
+index 0ff875b280b..37820c57a0a 100644
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
-@@ -1830,6 +1830,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
+@@ -1891,6 +1891,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' \
@@ -414,43 +344,3 @@ index fcd2b5b2d40..c034367994a 100644
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
-diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
- 
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
- 

dka64/scripts/build-gcc.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 \
@@ -65,7 +62,7 @@ then
 		--enable-lto \
 		--disable-tm-clone-registry \
 		--disable-__cxa_atexit \
-		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 18" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 25.1" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		$EXTRA_GCC_PARAMS \

dkarm-eabi/patches/binutils-2.37.patch

@@ -1,17 +0,0 @@
-diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
-index df09b7b8fddb82b21f97afee8821166d92220094..ac1eb8eb02c6d42533c0faa7aebdce432ac947e9 100644 (file)
---- a/libiberty/rust-demangle.c
-+++ b/libiberty/rust-demangle.c
-@@ -75,10 +75,10 @@ struct rust_demangler
-   int version;
- 
-   /* Recursion depth.  */
--  uint recursion;
-+  unsigned recursion;
-   /* Maximum number of times demangle_path may be called recursively.  */
- #define RUST_MAX_RECURSION_COUNT  1024
--#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
-+#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
- 
-   uint64_t bound_lifetime_depth;
- };

dkarm-eabi/patches/gcc-13.2.0.patch

@@ -1,70 +1,24 @@
-diff --git a/gcc/config.host b/gcc/config.host
-index 0a02c33cc80..38f7adc655e 100644
---- a/gcc/config.host
-+++ b/gcc/config.host
-@@ -251,6 +251,10 @@ case ${host} in
-     host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
-     host_lto_plugin_soname=liblto_plugin.dll
-     ;;
-+  aarch64-*-darwin*)
-+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
-+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
-+    ;;
-   i[34567]86-*-darwin* | x86_64-*-darwin*)
-     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
-     host_xmake_file="${host_xmake_file} i386/x-darwin"
-diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
-new file mode 100644
-index 00000000000..92c38b0b9db
---- /dev/null
-+++ b/gcc/config/aarch64/host-aarch64-darwin.c
-@@ -0,0 +1,32 @@
-+/* i386-darwin host-specific hook definitions.
-+   Copyright (C) 2003-2021 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/>.  */
-+
-+#define IN_TARGET_CODE 1
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
-+#include "config/host-darwin.h"
-+
-+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
-+   to include config/host-darwin.h.  */
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
-new file mode 100644
-index 00000000000..6d788d5e89c
---- /dev/null
-+++ b/gcc/config/aarch64/x-darwin
-@@ -0,0 +1,3 @@
-+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
-+	$(COMPILE) $<
-+	$(POSTCOMPILE)
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 6fd1594480a..92b82426f50 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1412,6 +1412,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 ab4b6acf5ea..2b8d0da296f 100644
+index f1fa3fa174c..2bb894b5b2d 100644
 --- a/gcc/config/arm/arm-cpus.in
 +++ b/gcc/config/arm/arm-cpus.in
-@@ -402,7 +402,7 @@ begin arch armv6k
+@@ -416,7 +416,7 @@ begin arch armv6k
   tune for mpcore
   tune flags CO_PROC
   base 6K
@@ -74,10 +28,10 @@ index ab4b6acf5ea..2b8d0da296f 100644
   optalias vfpv2 fp
   option nofp remove ALL_FP
 diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
-index d68def30867..d31f1e31ee6 100644
+index f7fc1460d1c..055f9d62385 100644
 --- a/gcc/config/arm/t-arm-elf
 +++ b/gcc/config/arm/t-arm-elf
-@@ -16,111 +16,14 @@
+@@ -16,120 +16,22 @@
  # along with GCC; see the file COPYING3.  If not see
  # <http://www.gnu.org/licenses/>.
  
@@ -103,6 +57,8 @@ index d68def30867..d31f1e31ee6 100644
 -# 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
 -
@@ -114,6 +70,8 @@ index d68def30867..d31f1e31ee6 100644
 -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
 -
@@ -123,8 +81,8 @@ index d68def30867..d31f1e31ee6 100644
 -
 -MULTILIB_OPTIONS     =
 -MULTILIB_DIRNAMES    =
-+MULTILIB_OPTIONS     = mthumb mbig-endian march=armv6k mfloat-abi=hard
-+MULTILIB_DIRNAMES    = thumb be armv6k fpu
++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	     =
@@ -176,15 +134,26 @@ index d68def30867..d31f1e31ee6 100644
 -			  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_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)
- 
--# PART 4 - Reuse rules
 +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
@@ -194,8 +163,9 @@ index d68def30867..d31f1e31ee6 100644
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
 -MULTILIB_REUSE	     += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
++MULTILIB_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 cca6f0ece54..8b78c28c7bb 100644
+index 397ac3f68b9..b9a388f19be 100644
 --- a/gcc/config/arm/unknown-elf.h
 +++ b/gcc/config/arm/unknown-elf.h
 @@ -29,7 +29,7 @@
@@ -214,27 +184,79 @@ index cca6f0ece54..8b78c28c7bb 100644
 -#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 360a280b23a..2c03947999a 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -45,7 +45,11 @@ 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?  */
-+#if __MINGW64__
-+static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
-+#else
- static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
-+#endif
- 
- /* Granularity for reserving address space.  */
- static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 4d790f9dd4a..10f0d08524c 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
+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/gcc.cc b/gcc/gcc.cc
+index 16bb07f2cdc..22a181a3a1c 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -868,6 +868,11 @@ proper position among the other output files.  */
  #endif
  #endif
  
@@ -246,7 +268,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC;
+@@ -1191,6 +1196,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;
@@ -254,7 +276,7 @@ index 4d790f9dd4a..10f0d08524c 100644
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] =
+@@ -1701,6 +1707,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),
@@ -273,10 +295,10 @@ index dddddc7c444..c2502597953 100644
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index 675930db043..bdfd6f6b0bb 100644
+index 93ff5b81dc5..20c0fe89a28 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@ register_tm_clones (void)
+@@ -326,7 +326,7 @@ register_tm_clones (void)
  
  #ifdef OBJECT_FORMAT_ELF
  
@@ -285,43 +307,48 @@ index 675930db043..bdfd6f6b0bb 100644
  /* 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/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
+diff --git a/libgcc/gthr.h b/libgcc/gthr.h
+index 1989c0c86ed..dc3220cdf3c 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__
++#ifdef __MINGW32__ || defined(__DEVKITARM__)
+ #undef GTHREAD_USE_WEAK
+ #define GTHREAD_USE_WEAK 0
+ #endif
+diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
+index a880e8ee227..2050e2e4ccf 100644
+--- a/libstdc++-v3/include/Makefile.am
++++ b/libstdc++-v3/include/Makefile.am
+@@ -1417,6 +1417,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' \
+ 	    < $< > $@
  
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
+diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
+index 0ff875b280b..7d270fc3a83 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@
+@@ -1891,6 +1892,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' \
+ 	    < $< > $@
  

dkarm-eabi/scripts/build-gcc.sh

@@ -66,7 +66,7 @@ then
 		--with-system-zlib \
 		--disable-tm-clone-registry \
 		--disable-__cxa_atexit \
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 57" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 63" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
                 $EXTRA_GCC_PARAMS \

dkppc/patches/binutils-2.36.1.patch

@@ -1,12 +0,0 @@
-diff -NBaur binutils-2.36.1/opcodes/ppc-opc.c binutils-2.36.1-ppc/opcodes/ppc-opc.c
---- binutils-2.36.1/opcodes/ppc-opc.c	2021-01-09 10:47:34.000000000 +0000
-+++ binutils-2.36.1-ppc/opcodes/ppc-opc.c	2021-02-14 19:41:09.350749949 +0000
-@@ -4225,7 +4225,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.37.patch

@@ -1,28 +0,0 @@
-diff -NBaur binutils-2.37/libiberty/rust-demangle.c binutils-2.37-new/libiberty/rust-demangle.c
---- binutils-2.37/libiberty/rust-demangle.c	2021-07-15 15:19:46.000000000 +0100
-+++ binutils-2.37-new/libiberty/rust-demangle.c	2022-01-01 22:02:21.860422023 +0000
-@@ -75,10 +75,10 @@
-   int version;
- 
-   /* Recursion depth.  */
--  uint recursion;
-+  unsigned recursion;
-   /* Maximum number of times demangle_path may be called recursively.  */
- #define RUST_MAX_RECURSION_COUNT  1024
--#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
-+#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
- 
-   uint64_t bound_lifetime_depth;
- };
-diff -NBaur binutils-2.37/opcodes/ppc-opc.c binutils-2.37-new/opcodes/ppc-opc.c
---- binutils-2.37/opcodes/ppc-opc.c	2021-07-08 12:37:21.000000000 +0100
-+++ binutils-2.37-new/opcodes/ppc-opc.c	2022-01-01 22:02:04.409141184 +0000
-@@ -4302,7 +4302,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.42.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 37f1aeb780c..f8de8aacc44 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-11.2.0.patch

@@ -1,918 +0,0 @@
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 4b937306ad0..bfd0375bd60 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
- case $1 in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-+    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
-     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
-     lynx)	thread_header=config/gthr-lynx.h ;;
-     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
-index 360a280b23a..2c03947999a 100644
---- a/gcc/config/i386/host-mingw32.c
-+++ b/gcc/config/i386/host-mingw32.c
-@@ -45,7 +45,11 @@ 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?  */
-+#if __MINGW64__
-+static const size_t pch_VA_max_size  = UINT64_C(64 * 1024 * 1024 * 1024);
-+#else
- static const size_t pch_VA_max_size  = 128 * 1024 * 1024;
-+#endif
- 
- /* Granularity for reserving address space.  */
- static size_t va_granularity = 0x10000;
-diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
-index 65d1fa2cd1f..51991aab75c 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 a7953fad965..04abd41239b 100644
---- a/gcc/config/rs6000/rs6000.h
-+++ b/gcc/config/rs6000/rs6000.h
-@@ -196,6 +196,7 @@ ASM_OPT_ANY
- /* -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.  */
-+#if 0
- #if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
- /* In driver-rs6000.c.  */
- extern const char *host_detect_local_cpu (int argc, const char **argv);
-@@ -207,6 +208,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/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 510abe169c5..988e82007b0 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
- 
- /* 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)         ; \
-@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
- 
- /* 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)         ; \
-@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
- /* 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)         ; \
-@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
- 
- #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)         ; \
-@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
- 
- #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)         ; \
-@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
-   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)         ; \
-@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
- 
- /* 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"
-@@ -851,6 +875,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 },			\
-@@ -860,6 +885,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 },			\
-@@ -869,6 +895,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 },			\
-@@ -880,7 +907,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 },			\
-@@ -890,6 +921,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 },			\
-@@ -901,6 +933,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 7ab55c49940..763709e907e 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 9b28369e3bf..79b95018a89 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -12593,7 +12593,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 162e08cbc02..34d35d0de8d 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1925,7 +1925,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 b372409dd42..708ba039963 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 48a4d65eed4..6835ea69279 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..26180aa7f36
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.c
-@@ -0,0 +1,319 @@
-+/* 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/>.  */
-+
-+#define _BUILDING_LIBGCC
-+#include "gthr-dkp.h"
-+#include <stddef.h>
-+
-+
-+int
-+__gthread_active_p (void)
-+{
-+  if (!__has_gthr_impl(active)) {
-+    return 0;
-+  }
-+
-+  return __gthr_impl_active();
-+}
-+
-+int
-+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
-+                  void *__args)
-+{
-+  if (!__has_gthr_impl(create)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_create(__threadid, __func, __args);
-+}
-+
-+int
-+__gthread_join (__gthread_t __threadid, void **__value_ptr)
-+{
-+  if (!__has_gthr_impl(join)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_join(__threadid, __value_ptr);
-+}
-+
-+int
-+__gthread_detach (__gthread_t __threadid)
-+{
-+  if (!__has_gthr_impl(detach)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_detach(__threadid);
-+}
-+
-+int
-+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
-+{
-+  if (!__has_gthr_impl(equal)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_equal(__t1, __t2);
-+}
-+
-+__gthread_t
-+__gthread_self (void)
-+{
-+  if (!__has_gthr_impl(self)) {
-+    __gthread_t result = { 0 };
-+    return result;
-+  }
-+
-+  return __gthr_impl_self();
-+}
-+
-+int
-+__gthread_yield (void)
-+{
-+  if (!__has_gthr_impl(yield)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_yield();
-+}
-+
-+int
-+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
-+{
-+  if (!__has_gthr_impl(once)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_once(__once, __func);
-+}
-+
-+int
-+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
-+{
-+  if (!__has_gthr_impl(key_create)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_key_create(__key, __dtor);
-+}
-+
-+int
-+__gthread_key_delete (__gthread_key_t __key)
-+{
-+  if (!__has_gthr_impl(key_delete)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_key_delete(__key);
-+}
-+
-+void *
-+__gthread_getspecific (__gthread_key_t __key)
-+{
-+  if (!__has_gthr_impl(getspecific)) {
-+    return NULL;
-+  }
-+
-+  return __gthr_impl_getspecific(__key);
-+}
-+
-+int
-+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
-+{
-+  if (!__has_gthr_impl(setspecific)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_setspecific(__key, __ptr);
-+}
-+
-+void
-+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
-+{
-+  if (__has_gthr_impl(mutex_init_function)) {
-+    __gthr_impl_mutex_init_function(__mutex);
-+  }
-+}
-+
-+int
-+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(mutex_destroy)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_mutex_destroy(__mutex);
-+}
-+
-+int
-+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(mutex_lock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_mutex_lock(__mutex);
-+}
-+
-+int
-+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(mutex_trylock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_mutex_trylock(__mutex);
-+}
-+
-+int
-+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(mutex_unlock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_mutex_unlock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(recursive_mutex_init_function)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_recursive_mutex_init_function(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(recursive_mutex_lock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_recursive_mutex_lock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(recursive_mutex_trylock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_recursive_mutex_trylock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(recursive_mutex_unlock)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_recursive_mutex_unlock(__mutex);
-+}
-+
-+int
-+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(recursive_mutex_destroy)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_recursive_mutex_destroy(__mutex);
-+}
-+
-+void
-+__gthread_cond_init_function (__gthread_cond_t *__cond)
-+{
-+  if (__has_gthr_impl(cond_init_function)) {
-+    __gthr_impl_cond_init_function(__cond);
-+  }
-+}
-+
-+int
-+__gthread_cond_broadcast (__gthread_cond_t *__cond)
-+{
-+  if (!__has_gthr_impl(cond_broadcast)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_cond_broadcast(__cond);
-+}
-+
-+int
-+__gthread_cond_signal (__gthread_cond_t *__cond)
-+{
-+  if (!__has_gthr_impl(cond_signal)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_cond_signal(__cond);
-+}
-+
-+int
-+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(cond_wait)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_cond_wait(__cond, __mutex);
-+}
-+
-+int
-+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                          const __gthread_time_t *__abs_timeout)
-+{
-+  if (!__has_gthr_impl(cond_timedwait)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
-+}
-+
-+int
-+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
-+                               __gthread_recursive_mutex_t *__mutex)
-+{
-+  if (!__has_gthr_impl(cond_wait_recursive)) {
-+    return -1;
-+  }
-+
-+  return __gthr_impl_cond_wait_recursive(__cond, __mutex);
-+}
-+
-+int
-+__gthread_cond_destroy (__gthread_cond_t* __cond)
-+{
-+  if (!__has_gthr_impl(cond_destroy)) {
-+    return -1;
-+  }
-+
-+  return __gthr_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..72ecf82ab83
---- /dev/null
-+++ b/libgcc/config/rs6000/gthr-dkp.h
-@@ -0,0 +1,187 @@
-+/* 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
-+
-+#ifdef _BUILDING_LIBGCC
-+#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
-+#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
-+#else
-+#define __GTHR_IMPL(_name) __gthr_impl_##_name
-+#endif
-+
-+int __GTHR_IMPL(active) (void);
-+int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
-+int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
-+int __GTHR_IMPL(detach) (__gthread_t __threadid);
-+int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
-+__gthread_t __GTHR_IMPL(self) (void);
-+int __GTHR_IMPL(yield) (void);
-+int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
-+int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
-+int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
-+void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
-+int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
-+void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
-+int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
-+int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
-+int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
-+int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
-+void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
-+int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
-+int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
-+int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
-+int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-+                         const __gthread_time_t *__abs_timeout);
-+int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
-+                              __gthread_recursive_mutex_t *__mutex);
-+int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
-+
-+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 4919a56f518..546b3413deb 100755
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5679,6 +5679,7 @@ tm_file="${tm_file_}"
- case $target_thread_file in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-+    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
-     gcn)	thread_header=config/gcn/gthr-gcn.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 675930db043..bdfd6f6b0bb 100644
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -325,7 +325,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/libstdc++-v3/configure b/libstdc++-v3/configure
-index 326a279c54f..d2cb9d18294 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15698,6 +15698,7 @@ $as_echo "$target_thread_file" >&6; }
- case $target_thread_file in
-     aix)	thread_header=config/rs6000/gthr-aix.h ;;
-     dce)	thread_header=config/pa/gthr-dce.h ;;
-+    dkp)        thread_header=config/rs6000/gthr-dkp.h ;;
-     gcn)	thread_header=config/gcn/gthr-gcn.h ;;
-     lynx)	thread_header=config/gthr-lynx.h ;;
-     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
-diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
-index 0413e3b7c25..ff5f8bbe1a1 100644
---- a/libstdc++-v3/include/c_compatibility/fenv.h
-+++ b/libstdc++-v3/include/c_compatibility/fenv.h
-@@ -26,6 +26,10 @@
-  *  This is a Standard C++ Library header.
-  */
- 
-+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+# include_next <fenv.h>
-+#else
-+
- #ifndef _GLIBCXX_FENV_H
- #define _GLIBCXX_FENV_H 1
- 
-@@ -79,3 +83,5 @@ namespace std
- #endif // C++11
- 
- #endif // _GLIBCXX_FENV_H
-+
-+#endif // __cplusplus
-diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
-index 0b0ec35a837..d24cb1a3c81 100644
---- a/libstdc++-v3/include/c_global/cfenv
-+++ b/libstdc++-v3/include/c_global/cfenv
-@@ -37,9 +37,11 @@
- 
- #include <bits/c++config.h>
- 
--#if _GLIBCXX_HAVE_FENV_H
--# include <fenv.h>
--#endif
-+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
-+// wrapper that might already be installed later in the include search path.
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-+#include_next <fenv.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- 
- #ifdef _GLIBCXX_USE_C99_FENV_TR1
- 

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 \
@@ -48,7 +48,7 @@ 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 \
@@ -76,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="" \
@@ -96,12 +95,13 @@ then
 	--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 \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 40" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 45.2" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
 	$EXTRA_GCC_PARAMS \
@@ -139,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

select_toolchain.sh

@@ -30,28 +30,28 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=11.2.0
-    BINUTILS_VER=2.37
-    NEWLIB_VER=4.2.0.20211231
+    GCC_VER=13.2.0
+    BINUTILS_VER=2.41
+    NEWLIB_VER=4.4.0.20231231
     basedir='dkarm-eabi'
     package=devkitARM
     target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=11.2.0
-    BINUTILS_VER=2.37
+    GCC_VER=13.2.0
+    BINUTILS_VER=2.42
     MN_BINUTILS_VER=2.24
-    NEWLIB_VER=4.2.0.20211231
+    NEWLIB_VER=4.4.0.20231231
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
     toolchain=DEVKITPPC
   ;;
   "3" )
-    GCC_VER=11.2.0
-    BINUTILS_VER=2.32
-    NEWLIB_VER=4.2.0.20211231
+    GCC_VER=13.2.0
+    BINUTILS_VER=2.42
+    NEWLIB_VER=4.4.0.20231231
     basedir='dka64'
     package=devkitA64
     target=aarch64-none-elf