From 96611cb945cd80a39e9e0e802ffa25a4870d5e27 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Fri, 10 May 2024 19:42:40 -0700 Subject: [PATCH] xtensa-dc233c-linux-*fdpic: update versions Update uclibc config for better test coverage and update gcc to the fdpic branch based on released gcc-14.1 Signed-off-by: Max Filippov --- .../crosstool.config | 2 +- .../crosstool.config | 5 +-- .../uclibc.config | 37 +++++++++---------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config b/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config index 5cff73320..b76e9ca41 100644 --- a/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config +++ b/samples/xtensa-dc233c-linux-muslfdpic/crosstool.config @@ -20,5 +20,5 @@ CT_MUSL_DEVEL_URL="https://github.com/jcmvbkbc/musl-xtensa.git" CT_MUSL_DEVEL_BRANCH="xtensa-1.2.5-fdpic" 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-14.1-fdpic" # 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 40bf091c4..42b16ff19 100644 --- a/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config +++ b/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config @@ -3,8 +3,7 @@ CT_EXPERIMENTAL=y CT_ARCH_XTENSA=y # CT_DEMULTILIB is not set # CT_ARCH_USE_MMU is not set -CT_TARGET_CFLAGS="-mauto-litpools -mfdpic -Os" -CT_TARGET_LDFLAGS="-mfdpic" +CT_TARGET_CFLAGS="-mauto-litpools -Os" CT_TARGET_VENDOR="dc233c" CT_KERNEL_LINUX=y CT_LINUX_SRC_DEVEL=y @@ -24,5 +23,5 @@ 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-14.1-fdpic" # CT_CC_GCC_SJLJ_EXCEPTIONS is not set diff --git a/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config b/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config index f05caea47..8a96bb431 100644 --- a/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config +++ b/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.46 C Library Configuration +# uClibc-ng 1.0.48 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -46,7 +46,6 @@ TARGET_SUBARCH="" UCLIBC_FORMAT_FDPIC_ELF=y # UCLIBC_FORMAT_FLAT is not set # UCLIBC_FORMAT_FLAT_SEP_DATA is not set -# UCLIBC_FORMAT_SHARED_FLAT is not set ARCH_HAS_DEPRECATED_SYSCALLS=y ARCH_ANY_ENDIAN=y ARCH_LITTLE_ENDIAN=y @@ -57,7 +56,7 @@ ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y -# DO_XSI_MATH is not set +DO_XSI_MATH=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" UCLIBC_UCLINUX_BROKEN_MUNMAP=y @@ -102,7 +101,7 @@ UCLIBC_HAS_UTMPX=y UCLIBC_HAS_UTMP=y # UCLIBC_SUSV2_LEGACY is not set UCLIBC_SUSV3_LEGACY=y -# UCLIBC_HAS_CONTEXT_FUNCS is not set +UCLIBC_HAS_CONTEXT_FUNCS=y # UCLIBC_SUSV3_LEGACY_MACROS is not set UCLIBC_SUSV4_LEGACY=y # UCLIBC_STRICT_HEADERS is not set @@ -113,8 +112,8 @@ UCLIBC_HAS___PROGNAME=y UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y -# UCLIBC_HAS_GETPT is not set -# UCLIBC_HAS_LIBUTIL is not set +UCLIBC_HAS_GETPT=y +UCLIBC_HAS_LIBUTIL=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y @@ -136,7 +135,7 @@ UCLIBC_LINUX_SPECIFIC=y UCLIBC_HAS_GNU_ERROR=y UCLIBC_BSD_SPECIFIC=y UCLIBC_HAS_BSD_ERR=y -# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set +UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y # UCLIBC_HAS_BSD_B64_NTOP_B64_PTON is not set # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set # UCLIBC_NTP_LEGACY is not set @@ -173,15 +172,15 @@ UCLIBC_HAS_STRING_ARCH_OPT=y UCLIBC_HAS_STDIO_FUTEXES=y UCLIBC_HAS_CTYPE_TABLES=y UCLIBC_HAS_CTYPE_SIGNED=y -UCLIBC_HAS_CTYPE_UNSAFE=y -# UCLIBC_HAS_CTYPE_CHECKED is not set +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y UCLIBC_HAS_LIBICONV=y -# UCLIBC_HAS_LIBINTL is not set +UCLIBC_HAS_LIBINTL=y # UCLIBC_HAS_LOCALE is not set -# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_STDIO_BUFSIZ_256=y # UCLIBC_HAS_STDIO_BUFSIZ_512 is not set @@ -197,10 +196,10 @@ UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set -# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -# UCLIBC_HAS_PRINTF_M_SPEC is not set +UCLIBC_HAS_PRINTF_M_SPEC=y UCLIBC_HAS_ERRNO_MESSAGES=y # UCLIBC_HAS_SYS_ERRLIST is not set UCLIBC_HAS_SIGNUM_MESSAGES=y @@ -215,12 +214,12 @@ UCLIBC_HAS_GNU_GETSUBOPT=y # UCLIBC_HAS_REGEX=y UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_WORDEXP is not set +UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y # UCLIBC_HAS_FTS is not set UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set +UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options @@ -234,8 +233,8 @@ HARDWIRED_ABSPATH=y # Security options # # UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -# UCLIBC_BUILD_NOW is not set +# UCLIBC_BUILD_RELRO is not set +UCLIBC_BUILD_NOW=y UCLIBC_BUILD_NOEXECSTACK=y #