From bec302a0d3a095521d9c3bccd741b6466becdee0 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 3 Jun 2024 00:06:36 -0700 Subject: [PATCH] xtensa-*-linux-*fdpic: update versions Switch from toolchain component branches to tags: - xtensa-fdpic-abi-spec-1.4 for binutils, - xtensa-fdpic-abi-spec-1.4 for gcc in xtensa-*-uclibc* - xtensa-fdpic-abi-spec-1.3 for gcc in xtensa-*-musl* - xtensa-fdpic-abi-spec-1.4 for uclibc-ng - xtensa-fdpic-abi-spec-1.2 for musl Don't write protect the built toolchain. Signed-off-by: Max Filippov --- samples/xtensa-dc233c-linux-muslfdpic/crosstool.config | 8 ++++---- samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config | 7 ++++--- samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config | 7 ++++--- samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config | 7 ++++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config b/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config index b76e9ca41..e0622e0d2 100644 --- a/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config +++ b/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config @@ -1,10 +1,10 @@ CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y +# CT_PREFIX_DIR_RO is not set CT_ARCH_XTENSA=y # CT_DEMULTILIB is not set # CT_ARCH_USE_MMU is not set CT_TARGET_CFLAGS="-mauto-litpools -Os" -CT_TARGET_LDFLAGS="-mfdpic" CT_TARGET_VENDOR="dc233c" CT_KERNEL_LINUX=y CT_LINUX_SRC_DEVEL=y @@ -12,13 +12,13 @@ CT_LINUX_DEVEL_BRANCH="v6.6" CT_ARCH_BINFMT_FDPIC=y CT_BINUTILS_SRC_DEVEL=y CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git" -CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl" +CT_BINUTILS_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_BINUTILS_PLUGINS=y # CT_BINUTILS_RELRO is not set CT_MUSL_SRC_DEVEL=y CT_MUSL_DEVEL_URL="https://github.com/jcmvbkbc/musl-xtensa.git" -CT_MUSL_DEVEL_BRANCH="xtensa-1.2.5-fdpic" +CT_MUSL_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.2" CT_GCC_SRC_DEVEL=y CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git" -CT_GCC_DEVEL_BRANCH="xtensa-14.1-fdpic" +CT_GCC_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.3" # CT_CC_GCC_SJLJ_EXCEPTIONS is not set diff --git a/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config b/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config index 42b16ff19..ab2fb947d 100644 --- a/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config +++ b/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config @@ -1,5 +1,6 @@ CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y +# CT_PREFIX_DIR_RO is not set CT_ARCH_XTENSA=y # CT_DEMULTILIB is not set # CT_ARCH_USE_MMU is not set @@ -11,17 +12,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6" CT_ARCH_BINFMT_FDPIC=y CT_BINUTILS_SRC_DEVEL=y CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git" -CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl" +CT_BINUTILS_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_BINUTILS_PLUGINS=y # CT_BINUTILS_RELRO is not set CT_LIBC_UCLIBC_NG=y CT_UCLIBC_NG_SRC_DEVEL=y CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git" -CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic" +CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config" CT_LIBC_UCLIBC_IPV6=y CT_LIBC_UCLIBC_WCHAR=y CT_GCC_SRC_DEVEL=y CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git" -CT_GCC_DEVEL_BRANCH="xtensa-14.1-fdpic" +CT_GCC_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" # CT_CC_GCC_SJLJ_EXCEPTIONS is not set diff --git a/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config b/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config index b678444a2..76b03b432 100644 --- a/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config +++ b/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config @@ -1,5 +1,6 @@ CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y +# CT_PREFIX_DIR_RO is not set CT_ARCH_XTENSA=y # CT_DEMULTILIB is not set # CT_ARCH_USE_MMU is not set @@ -12,17 +13,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6" CT_ARCH_BINFMT_FDPIC=y CT_BINUTILS_SRC_DEVEL=y CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git" -CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl" +CT_BINUTILS_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_BINUTILS_PLUGINS=y # CT_BINUTILS_RELRO is not set CT_LIBC_UCLIBC_NG=y CT_UCLIBC_NG_SRC_DEVEL=y CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git" -CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic" +CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-esp32-linux-uclibcfdpic/uclibc.config" CT_LIBC_UCLIBC_IPV6=y CT_LIBC_UCLIBC_WCHAR=y CT_GCC_SRC_DEVEL=y CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git" -CT_GCC_DEVEL_BRANCH="xtensa-14-9655-fdpic" +CT_GCC_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" # CT_CC_GCC_SJLJ_EXCEPTIONS is not set diff --git a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config index 1f4846c7d..b8811dafe 100644 --- a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config +++ b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config @@ -1,5 +1,6 @@ CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y +# CT_PREFIX_DIR_RO is not set CT_ARCH_XTENSA=y # CT_DEMULTILIB is not set # CT_ARCH_USE_MMU is not set @@ -12,17 +13,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6" CT_ARCH_BINFMT_FDPIC=y CT_BINUTILS_SRC_DEVEL=y CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git" -CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl" +CT_BINUTILS_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_BINUTILS_PLUGINS=y # CT_BINUTILS_RELRO is not set CT_LIBC_UCLIBC_NG=y CT_UCLIBC_NG_SRC_DEVEL=y CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git" -CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic" +CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-esp32s3-linux-uclibcfdpic/uclibc.config" CT_LIBC_UCLIBC_IPV6=y CT_LIBC_UCLIBC_WCHAR=y CT_GCC_SRC_DEVEL=y CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git" -CT_GCC_DEVEL_BRANCH="xtensa-14-9655-fdpic" +CT_GCC_DEVEL_BRANCH="xtensa-fdpic-abi-spec-1.4" # CT_CC_GCC_SJLJ_EXCEPTIONS is not set