devkitA64: update gcc to 12.1.0

devkitARM: update gcc to 12.1.0
devkitA64: update gcc to 12.1.0-RC-20220429
2026-08-21 09:54:03 -05:00 · 2022-05-06 17:46:22 +01:00 · 2022-05-06 13:27:04 +01:00 · 2022-05-02 22:19:23 +01:00 · 2022-04-30 18:00:21 +01:00 · 2022-04-30 17:57:26 +01:00
13 changed files with 621 additions and 646 deletions
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #---------------------------------------------------------------------------------
-#	devkitARM release 55
-#	devkitPPC release 39
-#	devkitA64 release 17
+#	devkitARM release 58
+#	devkitPPC release 40
+#	devkitA64 release 19
 #---------------------------------------------------------------------------------

 if [ 0 -eq 1 ] ; then
--- a/dka64/patches/gcc-12.1.0.patch
+++ b/dka64/patches/gcc-12.1.0.patch
@@ -1,71 +1,7 @@
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 357b0bed067..6b1e254785a 100644
--- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1090,7 +1090,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
- 	tmake_file="${tmake_file} aarch64/t-aarch64"
- 	case $target in
- 	aarch64-*-elf*)
-+		default_use_cxa_atexit=yes
- 		use_gcc_stdint=wrap
-+		tm_file="${tm_file} devkitpro.h"
-+		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
-+		extra_options="${extra_options} devkitpro.opt"
-+		case ${enable_threads} in
-+			"" | yes | posix) thread_file='posix' ;;
-+		esac
- 		;;
-         aarch64-*-fuchsia*)
-                 tm_file="${tm_file} fuchsia.h"
-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
--- a/gcc/config/aarch64/aarch64-elf-raw.h
-+++ b/gcc/config/aarch64/aarch64-elf-raw.h
-@@ -22,6 +22,7 @@
- #ifndef GCC_AARCH64_ELF_RAW_H
- #define GCC_AARCH64_ELF_RAW_H
- 
-+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
- #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
- #define ENDFILE_SPEC \
-   " crtend%O%s crtn%O%s " \
-diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
-index af3b7364a74..6df7a0dc8a1 100644
--- a/gcc/config/aarch64/aarch64-opts.h
-+++ b/gcc/config/aarch64/aarch64-opts.h
-@@ -48,6 +48,12 @@ enum aarch64_tls_type {
-   TLS_DESCRIPTORS
- };
- 
-+/* Which thread pointer access sequence to use.  */
-+enum aarch64_tp_type {
-+  TP_HARD,
-+  TP_SOFT
-+};
-+
- /* The code model defines the address generation strategy.
-    Most have a PIC and non-PIC variant.  */
- enum aarch64_code_model {
-diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
-index 12625a4bee3..4353e2658a1 100644
--- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -18053,8 +18053,24 @@ aarch64_load_tp (rtx target)
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -19417,8 +19417,24 @@
       || !register_operand (target, Pmode))
     target = gen_reg_rtx (Pmode);
 
@@ -92,11 +28,21 @@ index 12625a4bee3..4353e2658a1 100644
   return target;
 }
 
-diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index bfffbcd6abf..814de8c2918 100644
--- a/gcc/config/aarch64/aarch64.h
-+++ b/gcc/config/aarch64/aarch64.h
-@@ -1191,6 +1191,10 @@ typedef struct
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h	2022-05-02 21:50:30.086094234 +0100
+@@ -22,6 +22,7 @@
+ #ifndef GCC_AARCH64_ELF_RAW_H
+ #define GCC_AARCH64_ELF_RAW_H
+ 
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
+ #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
+ #define ENDFILE_SPEC \
+   " crtend%O%s crtn%O%s " \
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h	2022-05-02 21:50:30.090088643 +0100
+@@ -1245,6 +1245,10 @@
 /* Check TLS Descriptors mechanism is selected.  */
 #define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
 
@@ -107,7 +53,7 @@ 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);
+@@ -1290,7 +1294,7 @@
 #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
   { "rewrite_mcpu", aarch64_rewrite_mcpu },
 
@@ -116,11 +62,10 @@ index bfffbcd6abf..814de8c2918 100644
 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 abfd8452674..8b9f4423adb 100644
--- a/gcc/config/aarch64/aarch64.md
-+++ b/gcc/config/aarch64/aarch64.md
-@@ -6771,11 +6771,22 @@
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md	2022-05-02 21:50:30.090088643 +0100
+@@ -6899,11 +6899,22 @@
 (define_insn "aarch64_load_tp_hard"
   [(set (match_operand:DI 0 "register_operand" "=r")
 	(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -145,11 +90,10 @@ index abfd8452674..8b9f4423adb 100644
 ;; The TLS ABI specifically requires that the compiler does not schedule
 ;; instructions in the TLS stubs, in order to enable linker relaxation.
 ;; Therefore we treat the stubs as an atomic sequence.
-diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
-index 32191cf1acf..49b03937bdd 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)
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt	2022-05-02 21:50:30.090088643 +0100
+@@ -122,6 +122,21 @@
 EnumValue
 Enum(aarch64_tls_size) String(48) Value(48)
 
@@ -171,7 +115,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
+@@ -260,7 +275,7 @@
 long aarch64_stack_protector_guard_offset = 0
 
 moutline-atomics
@@ -180,49 +124,26 @@ 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.
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h	2022-05-02 21:50:30.086094234 +0100
+@@ -48,6 +48,12 @@
+   TLS_DESCRIPTORS
+ };
+ 
+/* Which thread pointer access sequence to use.  */
+enum aarch64_tp_type {
+  TP_HARD,
+  TP_SOFT
+};
 +
-+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
--- 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 \
+ /* The code model defines the address generation strategy.
+    Most have a PIC and non-PIC variant.  */
+ enum aarch64_code_model {
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
+--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64	2022-05-02 21:50:30.090088643 +0100
+@@ -177,8 +177,10 @@
 		$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
 
 comma=,
@@ -235,21 +156,10 @@ 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
--- /dev/null
-+++ b/gcc/config/devkitpro.h
-@@ -0,0 +1,31 @@
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h	2022-05-02 22:04:49.962851033 +0100
+@@ -0,0 +1,29 @@
 +/* Definitions for devkitPro toolchains.
 +   Copyright (C) 2016-2018 Free Software Foundation, Inc.
 +
@@ -279,13 +189,9 @@ index 00000000000..11ba0f5ab1c
 +    do {                                        \
 +        builtin_define ("__DEVKITA64__");       \
 +    } while (0)
-+
-+
-diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
-new file mode 100644
-index 00000000000..9acbbf9d27c
--- /dev/null
-+++ b/gcc/config/devkitpro.opt
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt
+--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt	1970-01-01 01:00:00.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt	2022-05-02 21:50:30.090088643 +0100
@@ -0,0 +1,29 @@
 +; Options for devkitPro toolchains.
 +
@@ -316,11 +222,10 @@ 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);
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -45,7 +45,11 @@
 static inline void w32_error(const char*, const char*, int, const char*);
 
 /* FIXME: Is this big enough?  */
@@ -332,11 +237,28 @@ index 360a280b23a..2c03947999a 100644
 
 /* Granularity for reserving address space.  */
 static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7837553958b..69d7a798e2e 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
+--- gcc-12.1.0-RC-20220429/gcc/config.gcc	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc	2022-05-02 21:50:30.086094234 +0100
+@@ -1093,7 +1093,14 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64"
+ 	case $target in
+ 	aarch64-*-elf*)
+		default_use_cxa_atexit=yes
+ 		use_gcc_stdint=wrap
+		tm_file="${tm_file} devkitpro.h"
+		tm_defines="${tm_defines}  TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
+		extra_options="${extra_options} devkitpro.opt"
+		case ${enable_threads} in
+			"" | yes | posix) thread_file='posix' ;;
+		esac
+ 		;;
+         aarch64-*-fuchsia*)
+                 tm_file="${tm_file} fuchsia.h"
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc	2022-05-02 21:50:30.090088643 +0100
+@@ -860,6 +860,11 @@
 #endif
 #endif
 
@@ -348,7 +270,7 @@ index 7837553958b..69d7a798e2e 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;
+@@ -1204,6 +1209,7 @@
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -356,7 +278,7 @@ index 7837553958b..69d7a798e2e 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[] =
+@@ -1709,6 +1715,7 @@
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -364,11 +286,10 @@ index 7837553958b..69d7a798e2e 100644
   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
   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
--- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -325,7 +325,7 @@ register_tm_clones (void)
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c	2022-05-02 21:50:30.094083051 +0100
+@@ -325,7 +325,7 @@
 
 #ifdef OBJECT_FORMAT_ELF
 
@@ -377,11 +298,10 @@ 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/libgcc/gthr.h b/libgcc/gthr.h
-index cca3f294b7b..deffea4107b 100644
--- a/libgcc/gthr.h
-+++ b/libgcc/gthr.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
+--- gcc-12.1.0-RC-20220429/libgcc/gthr.h	2022-04-29 14:58:25.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h	2022-05-02 21:50:30.094083051 +0100
+@@ -136,7 +136,7 @@
 /* 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.  */
@@ -390,11 +310,10 @@ index cca3f294b7b..deffea4107b 100644
 #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 40a41ef2a1c..4d06c6f9953 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}
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am	2022-04-29 14:58:26.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am	2022-05-02 21:50:30.094083051 +0100
+@@ -1366,6 +1366,7 @@
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -402,11 +321,10 @@ index 40a41ef2a1c..4d06c6f9953 100644
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < $< > $@
 
-diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
-index fcd2b5b2d40..c034367994a 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}
+diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in
+--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in	2022-04-29 14:58:26.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in	2022-05-02 21:50:30.094083051 +0100
+@@ -1857,6 +1857,7 @@
 	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
@@ -414,43 +332,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
- 
--- a/dka64/patches/newlib-4.2.0.20211231.patch
+++ b/dka64/patches/newlib-4.2.0.20211231.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 816b9c4b8..b79edb6c8 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2609,6 +2609,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -11,12 +11,12 @@ index 816b9c4b8..b79edb6c8 100755
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 4111724e1..0e44d885e 100644
--- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..577dfdec6 100644
+--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
 AC_INIT([libgloss],[LIBGLOSS_VERSION])
 AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
@@ -5141,11 +5141,11 @@ index 000000000..aa653c235
 +
 +
 +
-diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
+diff --git a/libgloss/libsysbase/configure.ac b/libgloss/libsysbase/configure.ac
 new file mode 100644
 index 000000000..da85a3f46
 --- /dev/null
-+++ b/libgloss/libsysbase/configure.in
+++ b/libgloss/libsysbase/configure.ac
@@ -0,0 +1,202 @@
 +# Copyright (c) 1995, 1996 Cygnus Support
 +#
@@ -8142,10 +8142,10 @@ index 000000000..b54e0ce7c
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -8153,24 +8153,33 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
+int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
+			ptr->deviceData = devoptab_list[dev]->deviceData;
+			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
+			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
+		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
+
+#ifndef _REENT_ONLY
+
+int
+rmdir (const char *filename)
+{
+  return _rmdir_r (_REENT, filename);
+}
+
+#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
 index 000000000..5dd550c5c
@@ -8739,10 +8748,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 1ddbb6c76..f096346dc 100644
+index c429dde1c..fd3171ad2 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -687,13 +687,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -686,13 +686,25 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	syscall_dir=syscalls
 	;;
   aarch64*-*-*)
@@ -8857,10 +8866,10 @@ index 000000000..a71a5d847
 +
 +#endif
 diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
-index ba1a8a17e..f521cad89 100644
+index 799ac494a..4174d72ab 100644
 --- a/newlib/libc/include/math.h
 +++ b/newlib/libc/include/math.h
-@@ -426,7 +426,7 @@ extern float hypotf (float, float);
+@@ -436,7 +436,7 @@ extern float hypotf (float, float);
    simply call the double functions.  On Cygwin the long double functions
    are implemented independently from newlib to be able to use optimized
    assembler functions despite using the Microsoft x86_64 ABI. */
@@ -8869,6 +8878,18 @@ index ba1a8a17e..f521cad89 100644
 /* Reentrant ANSI C functions.  */
 #ifndef __math_68881
 extern long double atanl (long double);
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
+extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/semaphore.h b/newlib/libc/include/semaphore.h
 new file mode 100755
 index 000000000..4afb0e419
@@ -8944,6 +8965,19 @@ index 000000000..4afb0e419
 +#endif /* defined(_POSIX_SEMAPHORES) */
 +
 +#endif /* !_SEMAPHORE_H_ */
+diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
+index 7748351f0..e87104559 100644
+--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
+@@ -227,7 +227,7 @@ int	fgetpos (FILE *, _fpos_t *);
+ #else
+ int	fgetpos (FILE *__restrict, fpos_t *__restrict);
+ #endif
+-int	fseek (FILE *, long, int);
+int	fseek (FILE *, off_t, int);
+ #ifdef _LIBC
+ int	fsetpos (FILE *, const _fpos_t *);
+ #else
 diff --git a/newlib/libc/include/sys/_pthreadtypes.h b/newlib/libc/include/sys/_pthreadtypes.h
 index 75e9e1cbf..dc63dbe6a 100644
 --- a/newlib/libc/include/sys/_pthreadtypes.h
@@ -9133,7 +9167,7 @@ index f810b008f..ca7e11dc7 100644
 +
 #endif /* !_SYS__TIMESPEC_H_ */
 diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
-index 4bc8d29bf..35c05e6af 100644
+index 61a6f95d8..34aeaad3d 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
@@ -4,6 +4,9 @@
@@ -9215,10 +9249,10 @@ index a3fb5c02c..b208de4a7 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index 218807178..93294ad2e 100644
+index 45476ce4a..6ed532439 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,16 @@ extern "C" {
+@@ -331,6 +331,16 @@ extern "C" {
 #  define __SSP_FORTIFY_LEVEL 0
 #endif
 
@@ -9541,7 +9575,7 @@ index 9a6f115a6..fdd6cf92b 100644
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 74b70e9c0..d8c5410ec 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
@@ -421,6 +421,8 @@ struct _reent
@@ -9562,7 +9596,7 @@ index 74b70e9c0..d8c5410ec 100644
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index 8769112b0..5526e59ee 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
@@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
@@ -9805,10 +9839,10 @@ index a0c80843a..efabdcfc4 100644
 
 /* Only access fixed "C" locale using this function.  Fake for !_MB_CAPABLE
 diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
-index e8b8197fa..011f69d69 100644
+index ca7c79074..c5815db9d 100644
 --- a/newlib/libc/machine/aarch64/Makefile.am
 +++ b/newlib/libc/machine/aarch64/Makefile.am
-@@ -9,6 +9,7 @@ AM_CCASFLAGS = $(INCLUDES)
+@@ -7,6 +7,7 @@ AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES =
@@ -9817,11 +9851,11 @@ index e8b8197fa..011f69d69 100644
 lib_a_SOURCES += memchr.S
 lib_a_SOURCES += memcmp-stub.c
 diff --git a/newlib/libc/machine/aarch64/Makefile.in b/newlib/libc/machine/aarch64/Makefile.in
-index 39b23a1ce..969512471 100644
+index c854a1b96..3361b0a8c 100644
 --- a/newlib/libc/machine/aarch64/Makefile.in
 +++ b/newlib/libc/machine/aarch64/Makefile.in
-@@ -69,22 +69,22 @@ LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
+@@ -75,22 +75,22 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
 lib_a_AR = $(AR) $(ARFLAGS)
 lib_a_LIBADD =
 -am_lib_a_OBJECTS = lib_a-memchr-stub.$(OBJEXT) lib_a-memchr.$(OBJEXT) \
@@ -9859,7 +9893,7 @@ index 39b23a1ce..969512471 100644
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
-@@ -210,7 +210,7 @@ AUTOMAKE_OPTIONS = cygnus
+@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
@@ -9868,9 +9902,9 @@ index 39b23a1ce..969512471 100644
 	memcpy-stub.c memcpy.S memmove-stub.c memmove.S memset-stub.c \
 	memset.S rawmemchr.S rawmemchr-stub.c setjmp.S stpcpy-stub.c \
 	stpcpy.S strchr-stub.c strchr.S strchrnul-stub.c strchrnul.S \
-@@ -381,6 +381,12 @@ lib_a-strrchr.obj: strrchr.S
+@@ -403,6 +403,12 @@ lib_a-strrchr.obj: strrchr.S
 .c.obj:
- 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 	$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 +lib_a-access.o: access.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c
@@ -9879,7 +9913,7 @@ index 39b23a1ce..969512471 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi`
 +
 lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
 
 diff --git a/newlib/libc/machine/aarch64/access.c b/newlib/libc/machine/aarch64/access.c
 new file mode 100644
@@ -9921,10 +9955,10 @@ index 000000000..980682ef3
 +}
 +	
 diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
-index 9bd35e733..731130092 100644
+index 2d559464a..1e6625c05 100644
 --- a/newlib/libc/machine/arm/Makefile.am
 +++ b/newlib/libc/machine/arm/Makefile.am
-@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
+@@ -9,7 +9,9 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strcmp.S strcpy.c \
 		aeabi_memcpy.c aeabi_memcpy-armv7a.S \
 		aeabi_memmove.c aeabi_memmove-soft.S \
@@ -9936,10 +9970,10 @@ index 9bd35e733..731130092 100644
 lib_a_SOURCES += memchr.S
 lib_a_SOURCES += memcpy-stub.c
 diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
-index d9dbcd5c3..43712f813 100644
+index 17a46a44d..b319b8349 100644
 --- a/newlib/libc/machine/arm/Makefile.in
 +++ b/newlib/libc/machine/arm/Makefile.in
-@@ -75,10 +75,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
+@@ -81,10 +81,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
 	lib_a-aeabi_memmove.$(OBJEXT) \
 	lib_a-aeabi_memmove-soft.$(OBJEXT) \
 	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
@@ -9954,7 +9988,7 @@ index d9dbcd5c3..43712f813 100644
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
-@@ -208,8 +208,8 @@ noinst_LIBRARIES = lib.a
+@@ -230,8 +230,8 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
 	aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
 	aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
@@ -9965,9 +9999,9 @@ index d9dbcd5c3..43712f813 100644
 lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
-@@ -367,6 +367,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
+@@ -389,6 +389,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
 lib_a-aeabi_memclr.obj: aeabi_memclr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
 
 +lib_a-sync_synchronize.o: sync_synchronize.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
@@ -9976,7 +10010,7 @@ index d9dbcd5c3..43712f813 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
 +
 lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
 
 diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
 new file mode 100644
@@ -10139,8 +10173,32 @@ index 84ff40b49..ba1d4ee7b 100644
 #define _STDIO_WITH_THREAD_CANCELLATION_SUPPORT
 #endif
 
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
+ #include <reent.h>
+ #include <stdio.h>
+#include <errno.h>
+ 
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
+ {
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
+  if (_unlink_r (ptr, filename) == -1) {
+    errno = 0;
+    if (_rmdir_r(ptr, filename) == -1)
+      return -1;
+  }
+ 
+   return 0;
+ }
 diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
-index 1aaf05aa4..b67182a79 100644
+index c1483c0ac..319b1972b 100644
 --- a/newlib/libc/stdio/vfprintf.c
 +++ b/newlib/libc/stdio/vfprintf.c
@@ -108,6 +108,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
@@ -10152,7 +10210,7 @@ index 1aaf05aa4..b67182a79 100644
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
 static char *rcsid = "$Id$";
-@@ -1434,7 +1436,7 @@ reswitch:	switch (ch) {
+@@ -1431,7 +1433,7 @@ reswitch:	switch (ch) {
 string:
 #endif
 			sign = '\0';
@@ -10161,7 +10219,7 @@ index 1aaf05aa4..b67182a79 100644
 			/* Behavior is undefined if the user passed a
 			   NULL string when precision is not 0.
 			   However, if we are not optimizing for size,
-@@ -1444,7 +1446,7 @@ string:
+@@ -1441,7 +1443,7 @@ string:
 				size = ((unsigned) prec > 6U) ? 6 : prec;
 			}
 			else
@@ -10171,7 +10229,7 @@ index 1aaf05aa4..b67182a79 100644
 			if (ch == 'S' || (flags & LONGINT)) {
 				mbstate_t ps;
 diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
-index 994cee7fc..5d1d0a1cd 100644
+index 037692531..b5e524c53 100644
 --- a/newlib/libc/stdio/vfscanf.c
 +++ b/newlib/libc/stdio/vfscanf.c
@@ -74,6 +74,8 @@ These are GNU extensions.
@@ -10184,7 +10242,7 @@ index 994cee7fc..5d1d0a1cd 100644
 #include <reent.h>
 #include <newlib.h>
 diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
-index 980b31e3b..722be905e 100644
+index 7384b37d3..b4e1dbde5 100644
 --- a/newlib/libc/stdio/vfwprintf.c
 +++ b/newlib/libc/stdio/vfwprintf.c
@@ -92,6 +92,9 @@ SEEALSO
@@ -10198,7 +10256,7 @@ index 980b31e3b..722be905e 100644
 
 #ifdef INTEGER_ONLY
 diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
-index f00d41a09..7e290ee8d 100644
+index e9e00dfec..c38d81e17 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
@@ -74,6 +74,9 @@ PORTABILITY
@@ -10212,10 +10270,10 @@ index f00d41a09..7e290ee8d 100644
 #include <reent.h>
 #include <newlib.h>
 diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
-index 357e37beb..7183b2100 100644
+index a91bdc784..e049adc9a 100644
 --- a/newlib/libc/stdlib/Makefile.am
 +++ b/newlib/libc/stdlib/Makefile.am
-@@ -110,6 +110,7 @@ MALLOCR=mallocr
+@@ -112,6 +112,7 @@ MALLOCR=mallocr
 endif
 
 EXTENDED_SOURCES = \
@@ -10224,10 +10282,10 @@ index 357e37beb..7183b2100 100644
 	arc4random_uniform.c \
 	cxa_atexit.c	\
 diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
-index 699831f13..1e6d2e612 100644
+index 0fed51d79..2d8dc1325 100644
 --- a/newlib/libc/stdlib/Makefile.in
 +++ b/newlib/libc/stdlib/Makefile.in
-@@ -119,7 +119,7 @@ am__objects_2 = lib_a-__adjust.$(OBJEXT) lib_a-__atexit.$(OBJEXT) \
+@@ -127,7 +127,7 @@ am__objects_2 = lib_a-__adjust.$(OBJEXT) lib_a-__atexit.$(OBJEXT) \
 	lib_a-wcstoumax.$(OBJEXT) lib_a-wcstombs.$(OBJEXT) \
 	lib_a-wcstombs_r.$(OBJEXT) lib_a-wctomb.$(OBJEXT) \
 	lib_a-wctomb_r.$(OBJEXT) $(am__objects_1)
@@ -10236,7 +10294,7 @@ index 699831f13..1e6d2e612 100644
 	lib_a-arc4random_uniform.$(OBJEXT) lib_a-cxa_atexit.$(OBJEXT) \
 	lib_a-cxa_finalize.$(OBJEXT) lib_a-drand48.$(OBJEXT) \
 	lib_a-ecvtbuf.$(OBJEXT) lib_a-efgcvt.$(OBJEXT) \
-@@ -173,7 +173,7 @@ am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
+@@ -182,7 +182,7 @@ am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
 	utoa.lo wcstod.lo wcstoimax.lo wcstol.lo wcstoul.lo \
 	wcstoumax.lo wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \
 	$(am__objects_8)
@@ -10245,9 +10303,9 @@ index 699831f13..1e6d2e612 100644
 	cxa_finalize.lo drand48.lo ecvtbuf.lo efgcvt.lo erand48.lo \
 	jrand48.lo lcong48.lo lrand48.lo mrand48.lo msize.lo mtrim.lo \
 	nrand48.lo rand48.lo seed48.lo srand48.lo strtoll.lo \
-@@ -1054,6 +1054,12 @@ lib_a-wcstold.o: wcstold.c
+@@ -1102,6 +1102,12 @@ lib_a-wcstold.o: wcstold.c
 lib_a-wcstold.obj: wcstold.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wcstold.obj `if test -f 'wcstold.c'; then $(CYGPATH_W) 'wcstold.c'; else $(CYGPATH_W) '$(srcdir)/wcstold.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wcstold.obj `if test -f 'wcstold.c'; then $(CYGPATH_W) 'wcstold.c'; else $(CYGPATH_W) '$(srcdir)/wcstold.c'; fi`
 
 +lib_a-threads.o: threads.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-threads.o `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
@@ -10256,21 +10314,8 @@ index 699831f13..1e6d2e612 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-threads.obj `if test -f 'threads.c'; then $(CYGPATH_W) 'threads.c'; else $(CYGPATH_W) '$(srcdir)/threads.c'; fi`
 +
 lib_a-arc4random.o: arc4random.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-arc4random.o `test -f 'arc4random.c' || echo '$(srcdir)/'`arc4random.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-arc4random.o `test -f 'arc4random.c' || echo '$(srcdir)/'`arc4random.c
 
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index feb22c24b..3dae0c9a9 100644
--- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -28,6 +28,8 @@
- 
- #include <reent.h>
- #include <stdlib.h>
-+#include <malloc.h>
-+#include <errno.h>
- 
- void *
- aligned_alloc (size_t align, size_t size)
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644
 --- a/newlib/libc/stdlib/mbtowc_r.c
--- a/dka64/scripts/build-gcc.sh
+++ b/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 17" \
+		--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 19" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
 		$EXTRA_GCC_PARAMS \
--- a/dkarm-eabi/patches/binutils-2.37.patch
+++ b/dkarm-eabi/patches/binutils-2.37.patch
@@ -0,0 +1,17 @@
+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;
+ };
--- a/dkarm-eabi/patches/gcc-12.1.0.patch
+++ b/dkarm-eabi/patches/gcc-12.1.0.patch
@@ -1,70 +1,7 @@
-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/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
-index 0becb4385b6..30bd4a24cd6 100644
--- a/gcc/config/arm/arm-cpus.in
-+++ b/gcc/config/arm/arm-cpus.in
-@@ -400,7 +400,7 @@ begin arch armv6k
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in	2022-04-30 13:31:09.120134164 +0100
+@@ -412,7 +412,7 @@
  tune for mpcore
  tune flags CO_PROC
  base 6K
@@ -73,11 +10,16 @@ index 0becb4385b6..30bd4a24cd6 100644
  option fp add VFPv2 FP_DBL
  optalias vfpv2 fp
  option nofp remove ALL_FP
-diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
-index d68def30867..d31f1e31ee6 100644
--- a/gcc/config/arm/t-arm-elf
-+++ b/gcc/config/arm/t-arm-elf
-@@ -16,111 +16,14 @@
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf	2022-04-30 13:31:39.759455398 +0100
+@@ -1,4 +1,4 @@
+-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
+ #
+ # This file is part of GCC.
+ #
+@@ -16,120 +16,14 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
@@ -103,6 +45,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 +58,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
 -
@@ -171,11 +117,16 @@ index d68def30867..d31f1e31ee6 100644
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v7_a_r), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  march?armv7+fp=march?$(ARCH)+fp)
- 
+-
 -MULTILIB_MATCHES     += $(foreach ARCH, $(all_v8_archs), \
 -			  march?armv7+fp=march?$(ARCH) \
 -			  $(foreach FPARCH, $(v8_fps), \
 -			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
+ 
+-MULTILIB_MATCHES     += $(foreach ARCH, $(all_v9_archs), \
+-			  march?armv7+fp=march?$(ARCH) \
+-			  $(foreach FPARCH, $(v9_fps), \
+-			    march?armv7+fp=march?$(ARCH)+$(FPARCH)))
 +MULTILIB_REQUIRED    = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard 
 
 -MULTILIB_MATCHES     += $(foreach ARCH, armv7e-m armv8-m.mainline, \
@@ -194,10 +145,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
-diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
-index cca6f0ece54..8b78c28c7bb 100644
--- a/gcc/config/arm/unknown-elf.h
-+++ b/gcc/config/arm/unknown-elf.h
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h
+--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h	2022-04-30 13:31:09.120134164 +0100
@@ -29,7 +29,7 @@
 #endif
 
@@ -214,11 +164,10 @@ 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);
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc
+--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc	2022-04-29 14:58:22.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc	2022-04-30 13:31:09.120134164 +0100
+@@ -45,7 +45,11 @@
 static inline void w32_error(const char*, const char*, int, const char*);
 
 /* FIXME: Is this big enough?  */
@@ -230,11 +179,10 @@ index 360a280b23a..2c03947999a 100644
 
 /* Granularity for reserving address space.  */
 static size_t va_granularity = 0x10000;
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7837553958b..69d7a798e2e 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -853,6 +853,11 @@ proper position among the other output files.  */
+diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
+--- gcc-12.1.0-RC-20220429/gcc/gcc.cc	2022-04-29 14:58:23.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc	2022-04-30 13:31:09.120134164 +0100
+@@ -860,6 +860,11 @@
 #endif
 #endif
 
@@ -246,7 +194,7 @@ index 7837553958b..69d7a798e2e 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;
+@@ -1204,6 +1209,7 @@
 static const char *lib_spec = LIB_SPEC;
 static const char *link_gomp_spec = "";
 static const char *libgcc_spec = LIBGCC_SPEC;
@@ -254,7 +202,7 @@ index 7837553958b..69d7a798e2e 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[] =
+@@ -1709,6 +1715,7 @@
   INIT_STATIC_SPEC ("lib",			&lib_spec),
   INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
   INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -262,21 +210,19 @@ index 7837553958b..69d7a798e2e 100644
   INIT_STATIC_SPEC ("startfile",		&startfile_spec),
   INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
   INIT_STATIC_SPEC ("version",			&compiler_version),
-diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
-index dddddc7c444..c2502597953 100644
--- a/libgcc/config/arm/t-bpabi
-+++ b/libgcc/config/arm/t-bpabi
-@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi
+--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi	2022-04-29 14:58:25.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi	2022-04-30 13:31:09.120134164 +0100
+@@ -17,4 +17,4 @@
 # On ARM, specifying -fnon-call-exceptions will needlessly pull in
 # the unwinder in simple programs which use 64-bit division.  Omitting
 # the option is safe.
 -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
 +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
-diff --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)
+diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
+--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c	2022-04-29 14:58:25.000000000 +0100
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c	2022-04-30 13:31:09.120134164 +0100
+@@ -325,7 +325,7 @@
 
 #ifdef OBJECT_FORMAT_ELF
 
@@ -285,43 +231,3 @@ 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.
-  */
- 
-+#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
- 
--- a/dkarm-eabi/patches/newlib-4.2.0.20211231.patch
+++ b/dkarm-eabi/patches/newlib-4.2.0.20211231.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 816b9c4b8..b79edb6c8 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2609,6 +2609,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -11,12 +11,12 @@ index 816b9c4b8..b79edb6c8 100755
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 4111724e1..0e44d885e 100644
--- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..577dfdec6 100644
+--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
 AC_INIT([libgloss],[LIBGLOSS_VERSION])
 AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
@@ -33,7 +33,7 @@ index 4111724e1..0e44d885e 100644
 AS=${AS-as}
 diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
 new file mode 100644
-index 000000000..7ee40deec
+index 000000000..edb10d215
 --- /dev/null
 +++ b/libgloss/libsysbase/Makefile.in
@@ -0,0 +1,148 @@
@@ -108,8 +108,8 @@ index 000000000..7ee40deec
 +	isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
 +	unlink.o wait.o write.o _exit.o malloc_vars.o \
 +	chdir.o mkdir.o rename.o build_argv.o statvfs.o \
-+	flock.o syscall_support.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
-+	fchmod.o chmod.o getreent.o rmdir.o utime.o scandir.o
+	flock.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
+	fchmod.o chmod.o getreent.o rmdir.o utime.o scandir.o syscall_support.o
 +
 +# Object files specific to particular targets.
 +EVALOBJS = ${OBJS}
@@ -130,10 +130,10 @@ index 000000000..7ee40deec
 +AR_FLAGS = qc
 +
 +.c.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
+	$(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
 +
 +.C.o:
-+	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
+	$(CC) $(CFLAGS_FOR_TARGET) -O2 -D_BUILDING_LIBSYSBASE $(INCLUDES) -c $(CFLAGS) $<
 +.s.o:
 +	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
 +
@@ -187,7 +187,7 @@ index 000000000..7ee40deec
 +	$(SHELL) config.status --recheck
 diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
 new file mode 100644
-index 000000000..e5cb5a9ed
+index 000000000..6effb1105
 --- /dev/null
 +++ b/libgloss/libsysbase/_exit.c
@@ -0,0 +1,17 @@
@@ -202,8 +202,8 @@ index 000000000..e5cb5a9ed
 +void _exit(int rc)
 +{
 +
-+	if ( __syscalls.exit ) {
-+		__syscalls.exit(rc);
+	if ( __has_syscall(exit) ) {
+		__syscall_exit(rc);
 +	}
 +
 +	while(1);
@@ -889,7 +889,7 @@ index 000000000..3668b5801
 +
 diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
 new file mode 100644
-index 000000000..01cfee469
+index 000000000..b36b5c079
 --- /dev/null
 +++ b/libgloss/libsysbase/clocks.c
@@ -0,0 +1,34 @@
@@ -899,8 +899,8 @@ index 000000000..01cfee469
 +
 +int clock_gettime(clockid_t clock_id, struct timespec *tp)
 +{
-+   if ( __syscalls.clock_gettime ) {
-+      return __syscalls.clock_gettime(clock_id, tp);
+   if ( __has_syscall(clock_gettime) ) {
+      return __syscall_clock_gettime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -909,8 +909,8 @@ index 000000000..01cfee469
 +
 +int clock_settime(clockid_t clock_id, const struct timespec *tp)
 +{
-+   if ( __syscalls.clock_settime ) {
-+      return __syscalls.clock_settime(clock_id, tp);
+   if ( __has_syscall(clock_settime) ) {
+      return __syscall_clock_settime(clock_id, tp);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -919,8 +919,8 @@ index 000000000..01cfee469
 +
 +int clock_getres (clockid_t clock_id, struct timespec *res)
 +{
-+   if ( __syscalls.clock_getres ) {
-+      return __syscalls.clock_getres(clock_id, res);
+   if ( __has_syscall(clock_getres) ) {
+      return __syscall_clock_getres(clock_id, res);
 +   } else {
 +      errno = ENOSYS;
 +      return -1;
@@ -5884,7 +5884,7 @@ index 000000000..fdce14b5f
 +
 diff --git a/libgloss/libsysbase/getreent.c b/libgloss/libsysbase/getreent.c
 new file mode 100644
-index 000000000..028d0eb77
+index 000000000..a3f1e98a9
 --- /dev/null
 +++ b/libgloss/libsysbase/getreent.c
@@ -0,0 +1,20 @@
@@ -5900,8 +5900,8 @@ index 000000000..028d0eb77
 +#endif
 +
 +struct _reent *__getreent() {
-+	if ( __syscalls.getreent ) {
-+		return __syscalls.getreent();
+	if ( __has_syscall(getreent) ) {
+		return __syscall_getreent();
 +	} else {
 +		return _impure_ptr;
 +	}
@@ -5910,7 +5910,7 @@ index 000000000..028d0eb77
 +
 diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
 new file mode 100644
-index 000000000..9d5b74724
+index 000000000..4f2211248
 --- /dev/null
 +++ b/libgloss/libsysbase/gettod.c
@@ -0,0 +1,33 @@
@@ -5940,7 +5940,7 @@ index 000000000..9d5b74724
 +	struct _reent *ptr = _REENT;
 +#endif
 +
-+	if ( __syscalls.gettod_r ) return __syscalls.gettod_r(ptr, ptimeval, ptimezone);
+	if ( __has_syscall(gettod_r) ) return __syscall_gettod_r(ptr, ptimeval, ptimezone);
 +
 +	ptr->_errno = ENOSYS;
 +	return -1;
@@ -6540,7 +6540,7 @@ index 000000000..b4fcbd3d7
 +}
 diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
 new file mode 100644
-index 000000000..3c96fc61b
+index 000000000..a233b9df6
 --- /dev/null
 +++ b/libgloss/libsysbase/nanosleep.c
@@ -0,0 +1,14 @@
@@ -6550,8 +6550,8 @@ index 000000000..3c96fc61b
 +
 +int nanosleep(const struct timespec *req, struct timespec *rem)
 +{
-+   if ( __syscalls.nanosleep ) {
-+      return __syscalls.nanosleep(req, rem);
+   if ( __has_syscall(nanosleep) ) {
+      return __syscall_nanosleep(req, rem);
 +   } else {
 +      *rem = *req;
 +      errno = ENOSYS;
@@ -6704,10 +6704,10 @@ index 000000000..97a056a72
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -6715,24 +6715,33 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
+int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
+			ptr->deviceData = devoptab_list[dev]->deviceData;
+			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
+			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
+		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
+
+#ifndef _REENT_ONLY
+
+int
+rmdir (const char *filename)
+{
+  return _rmdir_r (_REENT, filename);
+}
+
+#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
 index 000000000..5dd550c5c
@@ -6979,54 +6988,30 @@ index 000000000..84e221340
 +}
 diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
 new file mode 100644
-index 000000000..53fead72a
+index 000000000..9bb71aa0d
 --- /dev/null
 +++ b/libgloss/libsysbase/syscall_support.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,78 @@
 +#include <sys/iosupport.h>
 +
-+//---------------------------------------------------------------------------------
-+__syscalls_t __syscalls = {
-+//---------------------------------------------------------------------------------
-+	NULL,	// sbrk
-+	NULL,	// exit
-+	NULL,	// gettod_r
-+	NULL,	// lock_init
-+	NULL,	// lock_acquire
-+	NULL,	// lock_try_acquire
-+	NULL,	// lock_release
-+	NULL,	// lock_close
-+	NULL,	// lock_init_recursive
-+	NULL,	// lock_acquire_recursive
-+	NULL,	// lock_try_acquire_recursive
-+	NULL,	// lock_release_recursive
-+	NULL,	// lock_close_recursive
-+	NULL,	// __getreent
-+	NULL,	// clock_gettime
-+	NULL,	// clock_settime
-+	NULL,	// clock_getres
-+	NULL,	// nanosleep
-+};
-+
 +void __libc_lock_init(_LOCK_T *lock) {
 +
-+	if ( __syscalls.lock_init ) {
-+		__syscalls.lock_init(lock);
+	if ( __has_syscall(lock_init) ) {
+		__syscall_lock_init(lock);
 +	}
-+
 +}
 +
 +void __libc_lock_acquire(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire) {
-+		__syscalls.lock_acquire(lock);
+	if ( __has_syscall(lock_acquire) ) {
+		__syscall_lock_acquire(lock);
 +	}
 +}
 +
 +int __libc_lock_try_acquire(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire) {
-+		return __syscalls.lock_try_acquire(lock);
+	if ( __has_syscall(lock_acquire) ) {
+		return __syscall_lock_try_acquire(lock);
 +	} else {
 +		return 0;
 +	}
@@ -7034,15 +7019,15 @@ index 000000000..53fead72a
 +
 +void __libc_lock_release(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_release) {
-+		__syscalls.lock_release(lock);
+	if ( __has_syscall(lock_release) ) {
+		__syscall_lock_release(lock);
 +	}
 +}
 +
 +void __libc_lock_close(_LOCK_T *lock ) {
 +
-+	if ( __syscalls.lock_close) {
-+		__syscalls.lock_close(lock);
+	if ( __has_syscall(lock_close) ) {
+		__syscall_lock_close(lock);
 +	}
 +}
 +
@@ -7050,23 +7035,23 @@ index 000000000..53fead72a
 +
 +void __libc_lock_init_recursive(_LOCK_RECURSIVE_T *lock) {
 +
-+	if ( __syscalls.lock_init_recursive ) {
-+		__syscalls.lock_init_recursive(lock);
+	if ( __has_syscall(lock_init_recursive) ) {
+		__syscall_lock_init_recursive(lock);
 +	}
 +
 +}
 +
 +void __libc_lock_acquire_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire_recursive) {
-+		__syscalls.lock_acquire_recursive(lock);
+	if ( __has_syscall(lock_acquire_recursive) ) {
+		__syscall_lock_acquire_recursive(lock);
 +	}
 +}
 +
 +int __libc_lock_try_acquire_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_acquire_recursive) {
-+		return __syscalls.lock_try_acquire_recursive(lock);
+	if ( __has_syscall(lock_acquire_recursive) ) {
+		return __syscall_lock_try_acquire_recursive(lock);
 +	} else {
 +		return 0;
 +	}
@@ -7074,18 +7059,17 @@ index 000000000..53fead72a
 +
 +void __libc_lock_release_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_release_recursive) {
-+		__syscalls.lock_release_recursive(lock);
+	if ( __has_syscall(lock_release_recursive) ) {
+		__syscall_lock_release_recursive(lock);
 +	}
 +}
 +
 +void __libc_lock_close_recursive(_LOCK_RECURSIVE_T *lock ) {
 +
-+	if ( __syscalls.lock_close_recursive) {
-+		__syscalls.lock_close_recursive(lock);
+	if ( __has_syscall(lock_close_recursive) ) {
+		__syscall_lock_close_recursive(lock);
 +	}
 +}
-+
 diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
 new file mode 100644
 index 000000000..79484e7f4
@@ -7408,10 +7392,10 @@ index 000000000..61de918bc
 +	return ret;
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 1ddbb6c76..ed9999bea 100644
+index c429dde1c..26fb553a7 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -694,6 +694,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -693,6 +693,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	syscall_dir=syscalls
 	default_newlib_io_long_long="yes"
 	;;
@@ -7452,8 +7436,20 @@ index 5c293c83d..75ccf89f5 100644
 /* Under Cygwin, wchar_t (or its extension wint_t) is Unicode */
 #define _jp2uc(c) (c)
 #define _jp2uc_l(c, l) (c)
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
+extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
-index ab18806e3..db77ebb2a 100644
+index 7748351f0..7377b2aa3 100644
 --- a/newlib/libc/include/stdio.h
 +++ b/newlib/libc/include/stdio.h
@@ -233,7 +233,7 @@ int	fsetpos (FILE *, const _fpos_t *);
@@ -7466,7 +7462,7 @@ index ab18806e3..db77ebb2a 100644
 void	clearerr (FILE *);
 int	feof (FILE *);
 diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
-index 4bc8d29bf..35c05e6af 100644
+index 61a6f95d8..34aeaad3d 100644
 --- a/newlib/libc/include/sys/config.h
 +++ b/newlib/libc/include/sys/config.h
@@ -4,6 +4,9 @@
@@ -7546,10 +7542,10 @@ index a3fb5c02c..5debd1525 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index 218807178..c9efd7d03 100644
+index 45476ce4a..d76706321 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,9 @@ extern "C" {
+@@ -331,6 +331,9 @@ extern "C" {
 #  define __SSP_FORTIFY_LEVEL 0
 #endif
 
@@ -7561,10 +7557,10 @@ index 218807178..c9efd7d03 100644
 #ifdef __rtems__
 diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
 new file mode 100644
-index 000000000..c190fa37d
+index 000000000..7b366f593
 --- /dev/null
 +++ b/newlib/libc/include/sys/iosupport.h
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,115 @@
 +//---------------------------------------------------------------------------------
 +#ifndef __iosupp_h__
 +#define __iosupp_h__
@@ -7637,28 +7633,31 @@ index 000000000..c190fa37d
 +
 +extern const devoptab_t *devoptab_list[];
 +
-+typedef struct {
-+	void *(*sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
-+	void (*exit) ( int rc );
-+	int  (*gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
-+	void (*lock_init) (_LOCK_T *lock);
-+	void (*lock_acquire) (_LOCK_T *lock);
-+	int  (*lock_try_acquire) (_LOCK_T *lock);
-+	void (*lock_release) (_LOCK_T *lock);
-+	void (*lock_close) (_LOCK_T *lock);
-+	void (*lock_init_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
-+	int  (*lock_try_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_release_recursive) (_LOCK_RECURSIVE_T *lock);
-+	void (*lock_close_recursive) (_LOCK_RECURSIVE_T *lock);
-+	struct _reent *(*getreent) ();
-+	int (*clock_gettime)(clockid_t clock_id, struct timespec *tp);
-+	int (*clock_settime)(clockid_t clock_id, const struct timespec *tp);
-+	int (*clock_getres)(clockid_t clock_id, struct timespec *res);
-+	int (*nanosleep)(const struct timespec *req, struct timespec *rem);
-+} __syscalls_t;
+#ifdef _BUILDING_LIBSYSBASE
+#define __SYSCALL(_name) __attribute__((weak)) __syscall_##_name
+#define __has_syscall(_name) (&__syscall_##_name)
+#else
+#define __SYSCALL(_name) __syscall_##_name
+#endif
 +
-+extern __syscalls_t __syscalls;
+void *__SYSCALL(sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
+void __SYSCALL(exit) ( int rc );
+int  __SYSCALL(gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
+void __SYSCALL(lock_init) (_LOCK_T *lock);
+void __SYSCALL(lock_acquire) (_LOCK_T *lock);
+int  __SYSCALL(lock_try_acquire) (_LOCK_T *lock);
+void __SYSCALL(lock_release) (_LOCK_T *lock);
+void __SYSCALL(lock_close) (_LOCK_T *lock);
+void __SYSCALL(lock_init_recursive) (_LOCK_RECURSIVE_T *lock);
+void __SYSCALL(lock_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
+int  __SYSCALL(lock_try_acquire_recursive) (_LOCK_RECURSIVE_T *lock);
+void __SYSCALL(lock_release_recursive) (_LOCK_RECURSIVE_T *lock);
+void __SYSCALL(lock_close_recursive) (_LOCK_RECURSIVE_T *lock);
+struct _reent * __SYSCALL(getreent) ();
+int __SYSCALL(clock_gettime) (clockid_t clock_id, struct timespec *tp);
+int __SYSCALL(clock_settime) (clockid_t clock_id, const struct timespec *tp);
+int __SYSCALL(clock_getres) (clockid_t clock_id, struct timespec *res);
+int __SYSCALL(nanosleep) (const struct timespec *req, struct timespec *rem);
 +
 +int AddDevice( const devoptab_t* device);
 +int FindDevice(const char* name);
@@ -7692,7 +7691,7 @@ index 9a6f115a6..142e71d35 100644
 #define MAXPATHLEN PATH_MAX
 
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 74b70e9c0..d8c5410ec 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
@@ -421,6 +421,8 @@ struct _reent
@@ -7713,7 +7712,7 @@ index 74b70e9c0..d8c5410ec 100644
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index 8769112b0..5526e59ee 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
@@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
@@ -7917,10 +7916,10 @@ index 968642745..2ab1f9570 100644
   return __get_current_locale ()->ctype_ptr;
 }
 diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
-index 9bd35e733..731130092 100644
+index 2d559464a..1e6625c05 100644
 --- a/newlib/libc/machine/arm/Makefile.am
 +++ b/newlib/libc/machine/arm/Makefile.am
-@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
+@@ -9,7 +9,9 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strcmp.S strcpy.c \
 		aeabi_memcpy.c aeabi_memcpy-armv7a.S \
 		aeabi_memmove.c aeabi_memmove-soft.S \
@@ -7932,10 +7931,10 @@ index 9bd35e733..731130092 100644
 lib_a_SOURCES += memchr.S
 lib_a_SOURCES += memcpy-stub.c
 diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
-index d9dbcd5c3..43712f813 100644
+index 17a46a44d..b319b8349 100644
 --- a/newlib/libc/machine/arm/Makefile.in
 +++ b/newlib/libc/machine/arm/Makefile.in
-@@ -75,10 +75,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
+@@ -81,10 +81,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
 	lib_a-aeabi_memmove.$(OBJEXT) \
 	lib_a-aeabi_memmove-soft.$(OBJEXT) \
 	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
@@ -7950,7 +7949,7 @@ index d9dbcd5c3..43712f813 100644
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
-@@ -208,8 +208,8 @@ noinst_LIBRARIES = lib.a
+@@ -230,8 +230,8 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
 	aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
 	aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
@@ -7961,9 +7960,9 @@ index d9dbcd5c3..43712f813 100644
 lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
-@@ -367,6 +367,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
+@@ -389,6 +389,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
 lib_a-aeabi_memclr.obj: aeabi_memclr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
 
 +lib_a-sync_synchronize.o: sync_synchronize.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
@@ -7972,7 +7971,7 @@ index d9dbcd5c3..43712f813 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
 +
 lib_a-memchr-stub.o: memchr-stub.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
 
 diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
 new file mode 100644
@@ -8118,8 +8117,32 @@ index df8321461..9263e5829 100644
 	    {
 	      /* no more input: return partial result */
 #ifdef __SCLE
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
+ #include <reent.h>
+ #include <stdio.h>
+#include <errno.h>
+ 
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
+ {
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
+  if (_unlink_r (ptr, filename) == -1) {
+    errno = 0;
+    if (_rmdir_r(ptr, filename) == -1)
+      return -1;
+  }
+ 
+   return 0;
+ }
 diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
-index 1aaf05aa4..b67182a79 100644
+index c1483c0ac..319b1972b 100644
 --- a/newlib/libc/stdio/vfprintf.c
 +++ b/newlib/libc/stdio/vfprintf.c
@@ -108,6 +108,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
@@ -8131,7 +8154,7 @@ index 1aaf05aa4..b67182a79 100644
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
 static char *rcsid = "$Id$";
-@@ -1434,7 +1436,7 @@ reswitch:	switch (ch) {
+@@ -1431,7 +1433,7 @@ reswitch:	switch (ch) {
 string:
 #endif
 			sign = '\0';
@@ -8140,7 +8163,7 @@ index 1aaf05aa4..b67182a79 100644
 			/* Behavior is undefined if the user passed a
 			   NULL string when precision is not 0.
 			   However, if we are not optimizing for size,
-@@ -1444,7 +1446,7 @@ string:
+@@ -1441,7 +1443,7 @@ string:
 				size = ((unsigned) prec > 6U) ? 6 : prec;
 			}
 			else
@@ -8150,7 +8173,7 @@ index 1aaf05aa4..b67182a79 100644
 			if (ch == 'S' || (flags & LONGINT)) {
 				mbstate_t ps;
 diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
-index 994cee7fc..5d1d0a1cd 100644
+index 037692531..b5e524c53 100644
 --- a/newlib/libc/stdio/vfscanf.c
 +++ b/newlib/libc/stdio/vfscanf.c
@@ -74,6 +74,8 @@ These are GNU extensions.
@@ -8163,7 +8186,7 @@ index 994cee7fc..5d1d0a1cd 100644
 #include <reent.h>
 #include <newlib.h>
 diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
-index 980b31e3b..722be905e 100644
+index 7384b37d3..b4e1dbde5 100644
 --- a/newlib/libc/stdio/vfwprintf.c
 +++ b/newlib/libc/stdio/vfwprintf.c
@@ -92,6 +92,9 @@ SEEALSO
@@ -8177,7 +8200,7 @@ index 980b31e3b..722be905e 100644
 
 #ifdef INTEGER_ONLY
 diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
-index f00d41a09..7e290ee8d 100644
+index e9e00dfec..c38d81e17 100644
 --- a/newlib/libc/stdio/vfwscanf.c
 +++ b/newlib/libc/stdio/vfwscanf.c
@@ -74,6 +74,9 @@ PORTABILITY
@@ -8190,19 +8213,6 @@ index f00d41a09..7e290ee8d 100644
 #include <_ansi.h>
 #include <reent.h>
 #include <newlib.h>
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index feb22c24b..3dae0c9a9 100644
--- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -28,6 +28,8 @@
- 
- #include <reent.h>
- #include <stdlib.h>
-+#include <malloc.h>
-+#include <errno.h>
- 
- void *
- aligned_alloc (size_t align, size_t size)
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644
 --- a/newlib/libc/stdlib/mbtowc_r.c
@@ -8242,7 +8252,7 @@ index 000000000..40092f99f
 +
 diff --git a/newlib/libc/sys/arm/sys/lock.h b/newlib/libc/sys/arm/sys/lock.h
 new file mode 100644
-index 000000000..567fed56b
+index 000000000..a755d6443
 --- /dev/null
 +++ b/newlib/libc/sys/arm/sys/lock.h
@@ -0,0 +1,66 @@
@@ -8276,10 +8286,10 @@ index 000000000..567fed56b
 +extern int __libc_lock_try_acquire_recursive(_LOCK_RECURSIVE_T *lock);
 +
 +#define __LOCK_INIT(CLASS,NAME) \
-+CLASS _LOCK_T NAME = 1;
+CLASS _LOCK_T NAME = 0;
 +
 +#define __LOCK_INIT_RECURSIVE(CLASS,NAME) \
-+CLASS _LOCK_RECURSIVE_T NAME = {1,0,0};
+CLASS _LOCK_RECURSIVE_T NAME = {0,0,0};
 +
 +#define __lock_init(NAME) \
 +	__libc_lock_init(&(NAME))
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/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 56" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 58" \
 		$CROSS_PARAMS \
 		$CROSS_GCC_PARAMS \
                $EXTRA_GCC_PARAMS \
--- a/dkppc/patches/binutils-2.37.patch
+++ b/dkppc/patches/binutils-2.37.patch
@@ -0,0 +1,28 @@
+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
--- a/dkppc/patches/gcc-11.2.0.patch
+++ b/dkppc/patches/gcc-11.2.0.patch
@@ -10,6 +10,68 @@ index 4b937306ad0..bfd0375bd60 100644
     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.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/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
 index 360a280b23a..2c03947999a 100644
 --- a/gcc/config/i386/host-mingw32.c
@@ -40,7 +102,7 @@ index 65d1fa2cd1f..51991aab75c 100644
 
 #define SIG_ATOMIC_TYPE "int"
 diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
-index 164d359b724..4785fcf6e73 100644
+index a7953fad965..04abd41239b 100644
 --- a/gcc/config/rs6000/rs6000.h
 +++ b/gcc/config/rs6000/rs6000.h
@@ -196,6 +196,7 @@ ASM_OPT_ANY
@@ -250,7 +312,7 @@ index 7ab55c49940..763709e907e 100644
 Target RejectNegative
 Link with libyk.a, libc.a and crt0.o.
 diff --git a/gcc/configure b/gcc/configure
-index e8ecb3b0297..10ebe252c12 100755
+index 9b28369e3bf..79b95018a89 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -12593,7 +12593,7 @@ case ${enable_threads} in
@@ -263,7 +325,7 @@ index e8ecb3b0297..10ebe252c12 100755
     target_thread_file=${enable_threads}
     ;;
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 96a6f62b0d3..c5dd3465634 100644
+index 162e08cbc02..34d35d0de8d 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -1925,7 +1925,7 @@ case ${enable_threads} in
@@ -840,10 +902,10 @@ index fb812d3801f..7f6669d530f 100644
 
 # This can't end up in shared libgcc
 diff --git a/libgcc/configure b/libgcc/configure
-index dd3afb2c957..abc5466abdc 100755
+index 4919a56f518..546b3413deb 100755
 --- a/libgcc/configure
 +++ b/libgcc/configure
-@@ -5642,6 +5642,7 @@ tm_file="${tm_file_}"
+@@ -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 ;;
--- a/dkppc/patches/newlib-4.2.0.20211231.patch
+++ b/dkppc/patches/newlib-4.2.0.20211231.patch
@@ -1,8 +1,8 @@
 diff --git a/libgloss/configure b/libgloss/configure
-index 816b9c4b8..b79edb6c8 100755
+index e70c57d89..ac5c745f9 100755
 --- a/libgloss/configure
 +++ b/libgloss/configure
-@@ -2609,6 +2609,8 @@ if test "${config_libnosys}" = "true"; then
+@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
 
 fi
 
@@ -11,12 +11,12 @@ index 816b9c4b8..b79edb6c8 100755
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
-diff --git a/libgloss/configure.in b/libgloss/configure.in
-index 4111724e1..dfd632c20 100644
--- a/libgloss/configure.in
-+++ b/libgloss/configure.in
+diff --git a/libgloss/configure.ac b/libgloss/configure.ac
+index 0fbe99526..42ea1d2ed 100644
+--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)dnl
 AC_INIT([libgloss],[LIBGLOSS_VERSION])
 AC_CONFIG_SRCDIR([libnosys])
 +AC_CONFIG_SRCDIR([libsysbase])
@@ -6680,10 +6680,10 @@ index 000000000..1d7b7e8e7
 +}
 diff --git a/libgloss/libsysbase/rmdir.c b/libgloss/libsysbase/rmdir.c
 new file mode 100644
-index 000000000..2692a2997
+index 000000000..b8640b87d
 --- /dev/null
 +++ b/libgloss/libsysbase/rmdir.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,34 @@
 +#include "config.h"
 +#include <_ansi.h>
 +#include <_syslist.h>
@@ -6691,24 +6691,33 @@ index 000000000..2692a2997
 +#include <errno.h>
 +#include <sys/iosupport.h>
 +
-+int	rmdir (const char *name) {
-+	struct _reent *r = _REENT;
+int	_rmdir_r (struct _reent *ptr, const char *name) {
 +	int	dev,ret=-1;
 +
 +	dev	= FindDevice(name);
 +	if(dev!=-1) {
 +		if(devoptab_list[dev]->rmdir_r) {
-+			r->deviceData = devoptab_list[dev]->deviceData;
-+			ret = devoptab_list[dev]->rmdir_r(r,name);
+			ptr->deviceData = devoptab_list[dev]->deviceData;
+			ret = devoptab_list[dev]->rmdir_r(ptr,name);
 +		} else {
-+			r->_errno = ENOSYS;
+			ptr->_errno = ENOSYS;
 +		}
 +	} else {
-+		r->_errno =	ENODEV;
+		ptr->_errno =	ENODEV;
 +	}
 +
 +	return ret;
 +}
+
+#ifndef _REENT_ONLY
+
+int
+rmdir (const char *filename)
+{
+  return _rmdir_r (_REENT, filename);
+}
+
+#endif
 diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
 new file mode 100644
 index 000000000..83d922d85
@@ -7372,10 +7381,10 @@ index 000000000..bd25d775d
 +	exit ( main(__system_argv->argc,__system_argv->argv) );
 +}
 diff --git a/newlib/configure.host b/newlib/configure.host
-index 1ddbb6c76..ef4cbe6c3 100644
+index c429dde1c..350dbc8f0 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
-@@ -864,7 +864,13 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
+@@ -863,7 +863,13 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
 	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
 	;;
@@ -7416,6 +7425,18 @@ index 5c293c83d..75ccf89f5 100644
 /* Under Cygwin, wchar_t (or its extension wint_t) is Unicode */
 #define _jp2uc(c) (c)
 #define _jp2uc_l(c, l) (c)
+diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
+index 23d572cd3..65310c084 100644
+--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
+@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
+ extern int _open_r (struct _reent *, const char *, int, int);
+ extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+ extern int _rename_r (struct _reent *, const char *, const char *);
+extern int _rmdir_r (struct _reent *r, const char *name);
+ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+ extern int _stat_r (struct _reent *, const char *, struct stat *);
+ extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
 diff --git a/newlib/libc/include/sys/dirent.h b/newlib/libc/include/sys/dirent.h
 index a3fb5c02c..adb8e1083 100644
 --- a/newlib/libc/include/sys/dirent.h
@@ -7480,10 +7501,10 @@ index a3fb5c02c..adb8e1083 100644
 +
 +#endif // _dirent_h_
 diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
-index 218807178..c9efd7d03 100644
+index 45476ce4a..d76706321 100644
 --- a/newlib/libc/include/sys/features.h
 +++ b/newlib/libc/include/sys/features.h
-@@ -330,6 +330,9 @@ extern "C" {
+@@ -331,6 +331,9 @@ extern "C" {
 #  define __SSP_FORTIFY_LEVEL 0
 #endif
 
@@ -7617,7 +7638,7 @@ index 000000000..9bec9e473
 +#endif // __iosupp_h__
 +//---------------------------------------------------------------------------------
 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
-index 74b70e9c0..d8c5410ec 100644
+index e4e36170e..5b8d06ed6 100644
 --- a/newlib/libc/include/sys/reent.h
 +++ b/newlib/libc/include/sys/reent.h
@@ -421,6 +421,8 @@ struct _reent
@@ -7638,7 +7659,7 @@ index 74b70e9c0..d8c5410ec 100644
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
 diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
-index 8769112b0..5526e59ee 100644
+index 6525272dd..d24673618 100644
 --- a/newlib/libc/include/sys/stat.h
 +++ b/newlib/libc/include/sys/stat.h
@@ -142,8 +142,9 @@ int	mkfifo (const char *__path, mode_t __mode );
@@ -7871,10 +7892,10 @@ index a0c80843a..efabdcfc4 100644
 
 /* Only access fixed "C" locale using this function.  Fake for !_MB_CAPABLE
 diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
-index e86afdf1c..007bd1567 100644
+index 577b7f9b3..ce3bb7b53 100644
 --- a/newlib/libc/machine/powerpc/Makefile.am
 +++ b/newlib/libc/machine/powerpc/Makefile.am
-@@ -10,7 +10,7 @@ noinst_LIBRARIES = lib.a
+@@ -8,7 +8,7 @@ noinst_LIBRARIES = lib.a
 
 AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
 
@@ -7884,19 +7905,19 @@ index e86afdf1c..007bd1567 100644
 lib_a_CFLAGS=$(AM_CFLAGS)
 lib_a_LIBADD = @extra_objs@
 diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
-index 73b0cc471..12044cb8a 100644
+index 46acda680..892a82288 100644
 --- a/newlib/libc/machine/powerpc/Makefile.in
 +++ b/newlib/libc/machine/powerpc/Makefile.in
-@@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
+@@ -74,7 +74,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
 lib_a_AR = $(AR) $(ARFLAGS)
 -am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
 +am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
-@@ -196,7 +196,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+@@ -218,7 +218,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
@@ -7905,9 +7926,9 @@ index 73b0cc471..12044cb8a 100644
 lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 lib_a_LIBADD = @extra_objs@
-@@ -280,6 +280,12 @@ lib_a-setjmp.obj: setjmp.S
+@@ -302,6 +302,12 @@ lib_a-setjmp.obj: setjmp.S
 .c.obj:
- 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 	$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 +lib_a-access.o: access.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c
@@ -7916,7 +7937,7 @@ index 73b0cc471..12044cb8a 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi`
 +
 lib_a-vfprintf.o: vfprintf.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
 
 diff --git a/newlib/libc/machine/powerpc/access.c b/newlib/libc/machine/powerpc/access.c
 new file mode 100644
@@ -8084,10 +8105,10 @@ index 95f1a7422..c797d2e64 100644
 +
 #endif
 diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
-index aa22a0e3a..93e672b6a 100644
+index 6d18a4443..01402f4de 100644
 --- a/newlib/libc/stdio/Makefile.in
 +++ b/newlib/libc/stdio/Makefile.in
-@@ -507,6 +507,7 @@ GENERAL_SOURCES = \
+@@ -527,6 +527,7 @@ GENERAL_SOURCES = \
 	rename.c			\
 	rewind.c			\
 	rget.c				\
@@ -8095,9 +8116,9 @@ index aa22a0e3a..93e672b6a 100644
 	scanf.c			\
 	sccl.c				\
 	setbuf.c			\
-@@ -1176,6 +1177,12 @@ lib_a-rget.o: rget.c
+@@ -1196,6 +1197,12 @@ lib_a-rget.o: rget.c
 lib_a-rget.obj: rget.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
 
 +lib_a-rmdir.o: rmdir.c
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.o `test -f 'rmdir.c' || echo '$(srcdir)/'`rmdir.c
@@ -8106,7 +8127,7 @@ index aa22a0e3a..93e672b6a 100644
 +	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi`
 +
 lib_a-scanf.o: scanf.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
+ 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
 
 diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
 index 1ac551fed..d293b7b0e 100644
@@ -8174,19 +8195,30 @@ index df8321461..eee4181cd 100644
 	    {
 	      /* no more input: return partial result */
 #ifdef __SCLE
-diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
-index feb22c24b..3dae0c9a9 100644
--- a/newlib/libc/stdlib/aligned_alloc.c
-+++ b/newlib/libc/stdlib/aligned_alloc.c
-@@ -28,6 +28,8 @@
- 
+diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
+index d8dfdbd82..a85b5a99b 100644
+--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
+@@ -57,13 +57,17 @@ Supporting OS subroutine required: <<unlink>>.
+ #include <_ansi.h>
 #include <reent.h>
- #include <stdlib.h>
-+#include <malloc.h>
+ #include <stdio.h>
 +#include <errno.h>
 
- void *
- aligned_alloc (size_t align, size_t size)
+ int
+ _remove_r (struct _reent *ptr,
+        const char *filename)
+ {
+-  if (_unlink_r (ptr, filename) == -1)
+-    return -1;
+  if (_unlink_r (ptr, filename) == -1) {
+    errno = 0;
+    if (_rmdir_r(ptr, filename) == -1)
+      return -1;
+  }
+ 
+   return 0;
+ }
 diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
 index 920a7ea3c..ba5ee7652 100644
 --- a/newlib/libc/stdlib/mbtowc_r.c
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -101,7 +101,7 @@ then
 	--with-newlib \
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix \
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 39" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 40" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
 	$EXTRA_GCC_PARAMS \
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -30,28 +30,28 @@ done

 case "$VERSION" in
  "1" )
-    GCC_VER=11.1.0
-    BINUTILS_VER=2.36.1
-    NEWLIB_VER=4.1.0
+    GCC_VER=12.1.0
+    BINUTILS_VER=2.38
+    NEWLIB_VER=4.2.0.20211231
    basedir='dkarm-eabi'
    package=devkitARM
    target=arm-none-eabi
    toolchain=DEVKITARM
  ;;
  "2" )
-    GCC_VER=11.1.0
-    BINUTILS_VER=2.36.1
+    GCC_VER=11.2.0
+    BINUTILS_VER=2.37
    MN_BINUTILS_VER=2.24
-    NEWLIB_VER=4.1.0
+    NEWLIB_VER=4.2.0.20211231
    basedir='dkppc'
    package=devkitPPC
    target=powerpc-eabi
    toolchain=DEVKITPPC
  ;;
  "3" )
-    GCC_VER=11.1.0
+    GCC_VER=12.1.0
    BINUTILS_VER=2.32
-    NEWLIB_VER=4.1.0
+    NEWLIB_VER=4.2.0.20211231
    basedir='dka64'
    package=devkitA64
    target=aarch64-none-elf
Author	SHA1	Message	Date
Dave Murphy	df8b66a808	devkitA64: update gcc to 12.1.0	2022-05-06 17:46:22 +01:00
Dave Murphy	219b5dcebd	devkitARM: update gcc to 12.1.0	2022-05-06 13:27:04 +01:00
Dave Murphy	a370be5c4a	devkitA64: update gcc to 12.1.0-RC-20220429	2022-05-02 22:19:23 +01:00
Dave Murphy	a84866105a	devkitARM: update gcc to 12.1.0-RC-20220429	2022-04-30 18:00:21 +01:00
Dave Murphy	c0146427e1	devkitARM: update binutils to 2.38	2022-04-30 17:57:26 +01:00
Dave Murphy	a0ee149c40	devkitA64: remove obsolete flag setting	2022-01-27 20:55:27 +00:00
Dave Murphy	da06cfb478	devkitPPC: add arm64 macOS patch	2022-01-25 19:49:11 +00:00
Dave Murphy	b700c35789	devkitARM: update newlib to 4.2.0.20211231	2022-01-03 19:21:28 +00:00
Dave Murphy	73b1cb9d7a	devkitPPC: update newlib to 4.2.0.20211231	2022-01-03 19:21:20 +00:00
Dave Murphy	3ca5189cdd	devkitA64: update newlib to 4.2.0.20211231	2022-01-03 12:24:00 +00:00
Dave Murphy	4dc7a3333c	devkitPPC: next release is 40	2022-01-03 12:21:48 +00:00
Dave Murphy	98aac78959	devkitPPC: remove can delete directories	2022-01-02 18:34:36 +00:00
Dave Murphy	092f657e81	devkitPPC: update binutils to 2.37	2022-01-02 18:34:36 +00:00
Dave Murphy	7d3bbea16e	devkitPPC: update gcc to 11.2.0	2022-01-02 18:34:36 +00:00
Dave Murphy	066afb3cca	devkitARM: remove can delete directories	2022-01-02 18:34:36 +00:00
Dave Murphy	dd13eb9497	devkitARM: rework syscall interface	2022-01-02 18:34:36 +00:00
Dave Murphy	af726256f1	devkitARM: patch binutils for building with mingw	2022-01-02 18:34:36 +00:00
Dave Murphy	5e87380f11	devkitARM: update binutils to 2.37	2022-01-02 18:34:36 +00:00
Dave Murphy	cd9e7f1fee	devkitARM: update gcc to 11.2.0	2022-01-02 18:34:36 +00:00
Dave Murphy	f1bf935706	devkitA64: remove can delete directories	2022-01-02 18:34:36 +00:00
Dave Murphy	9ae621ad62	devkitA64: upgrade gcc to 11.2	2022-01-02 18:34:26 +00:00