From a096147b25c06d81dbb5eda035f4c795bb6cb4a2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 May 2023 10:01:46 +0200 Subject: gcc: switch to 12.2.0 as default Signed-off-by: Waldemar Brodkorb --- package/libgcc/Makefile | 2 +- target/config/Config.in.compiler | 2 +- toolchain/gcc/patches/12.2.0/nios2-softfp.patch | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 toolchain/gcc/patches/12.2.0/nios2-softfp.patch diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index e9ae22b86..b00bb59c5 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -34,7 +34,7 @@ endif else ifeq ($(ADK_TARGET_ARCH_AVR32),) ifeq ($(ADK_TARGET_BINFMT_FLAT),) - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif endif endif diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 22ea99dc6..bbb474ef8 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -21,7 +21,7 @@ default ADK_TOOLCHAIN_GCC_9 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_ARCH_CRIS # no longer supported default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_ARCH_H8300 # ICE default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_CPU_SH_J2 # j2.patch -default ADK_TOOLCHAIN_GCC_11 +default ADK_TOOLCHAIN_GCC_12 config ADK_TOOLCHAIN_GCC_GIT bool "git" diff --git a/toolchain/gcc/patches/12.2.0/nios2-softfp.patch b/toolchain/gcc/patches/12.2.0/nios2-softfp.patch new file mode 100644 index 000000000..c677c6c2f --- /dev/null +++ b/toolchain/gcc/patches/12.2.0/nios2-softfp.patch @@ -0,0 +1,14 @@ +diff -Nur gcc-6.2.0.orig/libgcc/config.host gcc-6.2.0/libgcc/config.host +--- gcc-6.2.0.orig/libgcc/config.host 2016-05-17 08:15:52.000000000 +0200 ++++ gcc-6.2.0/libgcc/config.host 2016-10-15 14:42:53.971919904 +0200 +@@ -962,6 +962,10 @@ + ;; + esac + ;; ++nios2-*-linux-uclibc*) ++ tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc t-softfp-sfdf t-softfp" ++ md_unwind_header=nios2/linux-unwind.h ++ ;; + nios2-*-linux*) + tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc" + md_unwind_header=nios2/linux-unwind.h -- cgit v1.2.3