From ecf9b7ff3566f76dfd48323bfa1f8243975e4966 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Fri, 11 May 2018 03:18:14 +0100 Subject: [PATCH] upgrade to gcc 8.1.0 --- dkarm-eabi/patches/gcc-8.1.0.patch | 291 +++++++++++++++++++++++++++++ select_toolchain.sh | 2 +- 2 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 dkarm-eabi/patches/gcc-8.1.0.patch diff --git a/dkarm-eabi/patches/gcc-8.1.0.patch b/dkarm-eabi/patches/gcc-8.1.0.patch new file mode 100644 index 0000000..602a67e --- /dev/null +++ b/dkarm-eabi/patches/gcc-8.1.0.patch @@ -0,0 +1,291 @@ +diff -NBaur gcc-8.1.0/gcc/config/arm/arm-cpus.in gcc-8.1.0-arm/gcc/config/arm/arm-cpus.in +--- gcc-8.1.0/gcc/config/arm/arm-cpus.in 2018-01-11 15:21:26.000000000 +0000 ++++ gcc-8.1.0-arm/gcc/config/arm/arm-cpus.in 2018-05-11 01:05:33.648236777 +0000 +@@ -393,7 +393,7 @@ + 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 -NBaur gcc-8.1.0/gcc/config/arm/t-arm-elf gcc-8.1.0-arm/gcc/config/arm/t-arm-elf +--- gcc-8.1.0/gcc/config/arm/t-arm-elf 2018-01-11 15:21:26.000000000 +0000 ++++ gcc-8.1.0-arm/gcc/config/arm/t-arm-elf 2018-05-10 23:15:13.124566279 +0000 +@@ -1,4 +1,4 @@ +-# Copyright (C) 1998-2018 Free Software Foundation, Inc. ++# Copyright (C) 1998-2017 Free Software Foundation, Inc. + # + # This file is part of GCC. + # +@@ -16,110 +16,83 @@ + # 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 := armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t +- +-all_early_arch := armv5e 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 +- +-# 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_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard + +-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 += march?armv6k=mtune?mpcore ++MULTILIB_MATCHES += march?armv6k=mcpu?mpcore + +-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \ +- march?armv7+fp=march?$(ARCH)+fp.dp) + +-# PART 4 - Reuse rules + +-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto +-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp +-MULTILIB_REUSE += mthumb=mthumb/march.armv5te+fp +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard +-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard ++#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te ++#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te ++#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 ++ ++#MULTILIB_OPTIONS += march=armv7 ++#MULTILIB_DIRNAMES += thumb2 ++#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7* ++#MULTILIB_MATCHES += march?armv7=march?armv7-a ++#MULTILIB_MATCHES += march?armv7=march?armv7-r ++#MULTILIB_MATCHES += march?armv7=march?armv7-m ++#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 ++#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 ++#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 ++ ++# Not quite true. We can support hard-vfp calling in Thumb2, but how do we ++# express that here? Also, we really need architecture v5e or later ++# (mcrr etc). ++#MULTILIB_OPTIONS += mfloat-abi=hard ++#MULTILIB_DIRNAMES += fpu ++#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* ++#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* ++#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* ++ ++# MULTILIB_OPTIONS += mcpu=ep9312 ++# MULTILIB_DIRNAMES += ep9312 ++# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* ++# ++# MULTILIB_OPTIONS += mlittle-endian/mbig-endian ++# MULTILIB_DIRNAMES += le be ++# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle ++# ++# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft ++# MULTILIB_DIRNAMES += fpu soft ++# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* ++# ++# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork ++# MULTILIB_DIRNAMES += normal interwork ++# ++# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore ++# MULTILIB_DIRNAMES += elf under ++# ++# MULTILIB_OPTIONS += mcpu=arm7 ++# MULTILIB_DIRNAMES += nofmult ++# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7* ++# # Note: the multilib_exceptions matches both -mthumb and ++# # -mthumb-interwork ++# # ++# # We have to match all the arm cpu variants which do not have the ++# # multiply instruction and treat them as if the user had specified ++# # -mcpu=arm7. Note that in the following the ? is interpreted as ++# # an = for the purposes of matching command line options. ++# # FIXME: There ought to be a better way to do this. ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610 ++# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620 +diff -NBaur gcc-8.1.0/gcc/config/arm/unknown-elf.h gcc-8.1.0-arm/gcc/config/arm/unknown-elf.h +--- gcc-8.1.0/gcc/config/arm/unknown-elf.h 2018-01-03 10:03:58.000000000 +0000 ++++ gcc-8.1.0-arm/gcc/config/arm/unknown-elf.h 2018-05-10 23:01:02.432676190 +0000 +@@ -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,9 @@ + 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 %L --end-group" ++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group" ++ ++/* The system headers under devkitARM are C++-aware. */ ++#undef NO_IMPLICIT_EXTERN_C ++#define NO_IMPLICIT_EXTERN_C ++ +diff -NBaur gcc-8.1.0/gcc/gcc.c gcc-8.1.0-arm/gcc/gcc.c +--- gcc-8.1.0/gcc/gcc.c 2018-02-09 06:44:06.000000000 +0000 ++++ gcc-8.1.0-arm/gcc/gcc.c 2018-05-10 23:01:02.440676328 +0000 +@@ -786,6 +786,11 @@ + #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 \ +@@ -1081,6 +1086,7 @@ + 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; +@@ -1577,6 +1583,7 @@ + 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 -NBaur gcc-8.1.0/libgcc/config/arm/t-bpabi gcc-8.1.0-arm/libgcc/config/arm/t-bpabi +--- gcc-8.1.0/libgcc/config/arm/t-bpabi 2012-08-17 15:06:06.000000000 +0000 ++++ gcc-8.1.0-arm/libgcc/config/arm/t-bpabi 2018-05-10 23:01:02.440676328 +0000 +@@ -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 -NBaur gcc-8.1.0/libgcc/crtstuff.c gcc-8.1.0-arm/libgcc/crtstuff.c +--- gcc-8.1.0/libgcc/crtstuff.c 2018-01-03 10:03:58.000000000 +0000 ++++ gcc-8.1.0-arm/libgcc/crtstuff.c 2018-05-10 23:01:02.440676328 +0000 +@@ -47,7 +47,7 @@ + + /* 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 -NBaur gcc-8.1.0/libgcc/Makefile.in gcc-8.1.0-arm/libgcc/Makefile.in +--- gcc-8.1.0/libgcc/Makefile.in 2018-01-03 10:03:58.000000000 +0000 ++++ gcc-8.1.0-arm/libgcc/Makefile.in 2018-05-10 23:01:02.440676328 +0000 +@@ -847,7 +847,7 @@ + # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and + # LIB2ADDEHSHARED matter. (Usually all three are identical.) + +-c_flags := -fexceptions ++c_flags := -fno-exceptions + + ifeq ($(enable_shared),yes) + diff --git a/select_toolchain.sh b/select_toolchain.sh index a531593..e75790f 100755 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -30,7 +30,7 @@ done case "$VERSION" in "1" ) - GCC_VER=7.3.0 + GCC_VER=8.1.0 BINUTILS_VER=2.30 NEWLIB_VER=3.0.0 GDB_VER=8.0