diff --git a/dkarm-eabi/patches/gcc-9.1.0.patch b/dkarm-eabi/patches/gcc-9.1.0.patch new file mode 100644 index 0000000..9d91e29 --- /dev/null +++ b/dkarm-eabi/patches/gcc-9.1.0.patch @@ -0,0 +1,215 @@ +diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in +index 3a55f6ac6d2..1a16dcc1c74 100644 +--- a/gcc/config/arm/arm-cpus.in ++++ b/gcc/config/arm/arm-cpus.in +@@ -352,7 +352,7 @@ begin arch armv6k + tune for mpcore + tune flags CO_PROC + base 6K +- isa ARMv6k ++ isa ARMv6k VFPv2 FP_DBL + option fp add VFPv2 FP_DBL + optalias vfpv2 fp + option nofp remove ALL_FP +diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf +index 8911d489f14..b1976386bab 100644 +--- a/gcc/config/arm/t-arm-elf ++++ b/gcc/config/arm/t-arm-elf +@@ -1,4 +1,4 @@ +-# Copyright (C) 1998-2019 Free Software Foundation, Inc. ++# Copyright (C) 1998-2017 Free Software Foundation, Inc. + # + # This file is part of GCC. + # +@@ -16,111 +16,14 @@ + # along with GCC; see the file COPYING3. If not see + # . + +-# Build a very basic set of libraries that should cater for most cases. +- +-# Single-precision floating-point is NOT supported; we don't build a +-# suitable library for that. Use the rm-profile config in that case. +- +-# PART 1 - Useful groups of options +- +-dp_fpus := vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \ +- neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \ +- fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \ +- vfp3 +- +-sp_fpus := vfpv3xd vfpv3xd-fp16 fpv4-sp-d16 fpv5-sp-d16 +- +-v7a_fps := vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4 +-v7ve_fps := vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \ +- neon-fp16 simd +- +-# Not all these permutations exist for all architecture variants, but +-# it seems to work ok. +-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml +- +-# We don't do anything special with these. Pre-v4t probably doesn't work. +-all_early_nofp := armv4 armv4t armv5t +- +-all_early_arch := armv5tej armv6 armv6j armv6k armv6z armv6kz \ +- armv6zk armv6t2 iwmmxt iwmmxt2 +- +-all_v7_a_r := armv7-a armv7ve armv7-r +- +-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \ +- armv8.5-a +- +-# No floating point variants, require thumb1 softfp +-all_nofp_t := armv6-m armv6s-m armv8-m.base +- +-all_nofp_t2 := armv7-m +- +-all_sp_only := armv7e-m armv8-m.main +- +-MULTILIB_OPTIONS = +-MULTILIB_DIRNAMES = ++MULTILIB_OPTIONS = mthumb mbig-endian march=armv6k mfloat-abi=hard ++MULTILIB_DIRNAMES = thumb be armv6k fpu + MULTILIB_EXCEPTIONS = + MULTILIB_MATCHES = +-MULTILIB_REUSE = +- +-# PART 2 - multilib build rules +- +-MULTILIB_OPTIONS += marm/mthumb +-MULTILIB_DIRNAMES += arm thumb +- +-MULTILIB_OPTIONS += mfpu=auto +-MULTILIB_DIRNAMES += autofp +- +-MULTILIB_OPTIONS += march=armv5te+fp/march=armv7+fp +-MULTILIB_DIRNAMES += v5te v7 +- +-MULTILIB_OPTIONS += mfloat-abi=hard +-MULTILIB_DIRNAMES += fpu +- +-# Build a total of 4 library variants (base options plus the following): +-MULTILIB_REQUIRED += mthumb +-MULTILIB_REQUIRED += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard +-MULTILIB_REQUIRED += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard +- +-# PART 3 - Match rules +- +-# Map all supported FPUs onto mfpu=auto +-MULTILIB_MATCHES += $(foreach FPU, $(dp_fpus), \ +- mfpu?auto=mfpu?$(FPU)) +- +-MULTILIB_MATCHES += march?armv5te+fp=march?armv5te +- +-MULTILIB_MATCHES += $(foreach ARCH, $(all_early_arch), \ +- march?armv5te+fp=march?$(ARCH) \ +- march?armv5te+fp=march?$(ARCH)+fp) +- +-MULTILIB_MATCHES += march?armv7+fp=march?armv7 +- +-MULTILIB_MATCHES += $(foreach FPARCH, $(v7a_fps), \ +- march?armv7+fp=march?armv7-a+$(FPARCH)) +- +-MULTILIB_MATCHES += $(foreach FPARCH, $(v7ve_fps), \ +- march?armv7+fp=march?armv7ve+$(FPARCH)) +- +-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \ +- march?armv7+fp=march?$(ARCH) \ +- march?armv7+fp=march?$(ARCH)+fp) + +-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \ +- march?armv7+fp=march?$(ARCH) \ +- $(foreach FPARCH, $(v8_fps), \ +- march?armv7+fp=march?$(ARCH)+$(FPARCH))) ++MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard + +-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \ +- march?armv7+fp=march?$(ARCH)+fp.dp) + +-# PART 4 - Reuse rules ++MULTILIB_MATCHES += march?armv6k=mtune?mpcore ++MULTILIB_MATCHES += march?armv6k=mcpu?mpcore + +-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto +-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp +-MULTILIB_REUSE += mthumb=mthumb/march.armv5te+fp +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard +diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h +index cf9ba6b4dc0..008d7555ecb 100644 +--- a/gcc/config/arm/unknown-elf.h ++++ b/gcc/config/arm/unknown-elf.h +@@ -29,7 +29,7 @@ + #endif + + /* Now we define the strings used to build the spec file. */ +-#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s" ++#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s" + + #undef STARTFILE_SPEC + #define STARTFILE_SPEC \ +@@ -93,4 +93,5 @@ + udivmoddi4, which will depend on the exception unwind routines, + which will depend on abort, which is defined in libc. */ + #undef LINK_GCC_C_SEQUENCE_SPEC +-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group" ++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group" ++ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 4f57765b012..2899202cc05 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -794,6 +794,11 @@ proper position among the other output files. */ + #endif + #endif + ++#ifndef LIBGLOSS_SPEC ++# define LIBGLOSS_SPEC "-lsysbase" ++#endif ++ ++ + /* config.h can define STARTFILE_SPEC to override the default crt0 files. */ + #ifndef STARTFILE_SPEC + #define STARTFILE_SPEC \ +@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC; + static const char *lib_spec = LIB_SPEC; + static const char *link_gomp_spec = ""; + static const char *libgcc_spec = LIBGCC_SPEC; ++static const char *libgloss_spec = LIBGLOSS_SPEC; + static const char *endfile_spec = ENDFILE_SPEC; + static const char *startfile_spec = STARTFILE_SPEC; + static const char *linker_name_spec = LINKER_NAME; +@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] = + INIT_STATIC_SPEC ("lib", &lib_spec), + INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec), + INIT_STATIC_SPEC ("libgcc", &libgcc_spec), ++ INIT_STATIC_SPEC ("libgloss", &libgloss_spec), + INIT_STATIC_SPEC ("startfile", &startfile_spec), + INIT_STATIC_SPEC ("cross_compile", &cross_compile), + INIT_STATIC_SPEC ("version", &compiler_version), +diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi +index dddddc7c444..c2502597953 100644 +--- a/libgcc/config/arm/t-bpabi ++++ b/libgcc/config/arm/t-bpabi +@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver + # On ARM, specifying -fnon-call-exceptions will needlessly pull in + # the unwinder in simple programs which use 64-bit division. Omitting + # the option is safe. +-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions ++LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions +diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c +index 4927a9f8977..2a79e3e137d 100644 +--- a/libgcc/crtstuff.c ++++ b/libgcc/crtstuff.c +@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + /* Target machine header files require this define. */ + #define IN_LIBGCC2 +- ++#define USED_FOR_TARGET + /* FIXME: Including auto-host is incorrect, but until we have + identified the set of defines that need to go into auto-target.h, + this will have to do. */ diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh index 75f400f..2eabc62 100755 --- a/dkarm-eabi/scripts/build-gcc.sh +++ b/dkarm-eabi/scripts/build-gcc.sh @@ -64,7 +64,7 @@ then --prefix=$prefix \ --enable-lto\ --with-system-zlib \ - --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 52-2" \ + --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 53" \ $CROSS_PARAMS \ $CROSS_GCC_PARAMS \ || { echo "Error configuring gcc"; exit 1; } diff --git a/select_toolchain.sh b/select_toolchain.sh index 0abf1fe..16a6c45 100755 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -30,7 +30,7 @@ done case "$VERSION" in "1" ) - GCC_VER=8.3.0 + GCC_VER=9.1.0 BINUTILS_VER=2.32 NEWLIB_VER=3.1.0 GDB_VER=8.2.1