diff --git a/dkarm-eabi/patches/gcc-11.2.0.patch b/dkarm-eabi/patches/gcc-12.1.0-RC-20220429.patch similarity index 58% rename from dkarm-eabi/patches/gcc-11.2.0.patch rename to dkarm-eabi/patches/gcc-12.1.0-RC-20220429.patch index 842455e..95b119c 100644 --- a/dkarm-eabi/patches/gcc-11.2.0.patch +++ b/dkarm-eabi/patches/gcc-12.1.0-RC-20220429.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 -+. */ -+ -+#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 ab4b6acf5ea..2b8d0da296f 100644 ---- a/gcc/config/arm/arm-cpus.in -+++ b/gcc/config/arm/arm-cpus.in -@@ -402,7 +402,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 ab4b6acf5ea..2b8d0da296f 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 # . @@ -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 4d790f9dd4a..10f0d08524c 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 4d790f9dd4a..10f0d08524c 100644 /* config.h can define STARTFILE_SPEC to override the default crt0 files. */ #ifndef STARTFILE_SPEC #define STARTFILE_SPEC \ -@@ -1197,6 +1202,7 @@ static const char *link_spec = LINK_SPEC; +@@ -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 4d790f9dd4a..10f0d08524c 100644 static const char *endfile_spec = ENDFILE_SPEC; static const char *startfile_spec = STARTFILE_SPEC; static const char *linker_name_spec = LINKER_NAME; -@@ -1702,6 +1708,7 @@ static struct spec_list static_specs[] = +@@ -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 4d790f9dd4a..10f0d08524c 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 -+#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 - --#if _GLIBCXX_HAVE_FENV_H --# include --#endif -+// Need to ensure this finds the C library's not a libstdc++ -+// wrapper that might already be installed later in the include search path. -+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS -+#include_next -+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - - #ifdef _GLIBCXX_USE_C99_FENV_TR1 - diff --git a/select_toolchain.sh b/select_toolchain.sh index 53c4f7b..d7c57f6 100755 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -30,7 +30,7 @@ done case "$VERSION" in "1" ) - GCC_VER=11.2.0 + GCC_VER=12.1.0-RC-20220429 BINUTILS_VER=2.38 NEWLIB_VER=4.2.0.20211231 basedir='dkarm-eabi'