26 Dec
2017
26 Dec
'17
11:03 a.m.
This bugfix is depend on uclibc-ng patch:
csky: remove -mcpu and -mhard-float from config
Signed-off-by: Guo Ren <ren_guo(a)c-sky.com>
---
scripts/config.sub | 2 ++
target/config/Config.in.cpu | 2 ++
target/config/Config.in.float | 1 +
toolchain/gcc/Makefile | 4 ++++
4 files changed, 9 insertions(+)
diff --git a/scripts/config.sub b/scripts/config.sub
index 6333123..6c22a0f 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -258,6 +258,7 @@ case $basic_machine in
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
+ | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -381,6 +382,7 @@ case $basic_machine in
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
+ | csky-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index b7d17d9..77328d8 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -504,6 +504,7 @@ config ADK_TARGET_CPU_CSKY_CK810F
select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_SUPPORTS_NPTL
select ADK_TARGET_WITH_MMU
+ select ADK_TARGET_CPU_WITH_FPU
depends on ADK_TARGET_ARCH_CSKY
depends on ADK_TARGET_LITTLE_ENDIAN
@@ -513,6 +514,7 @@ config ADK_TARGET_CPU_CSKY_CK807F
select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_SUPPORTS_NPTL
select ADK_TARGET_WITH_MMU
+ select ADK_TARGET_CPU_WITH_FPU
depends on ADK_TARGET_ARCH_CSKY
depends on ADK_TARGET_LITTLE_ENDIAN
diff --git a/target/config/Config.in.float b/target/config/Config.in.float
index 842b38f..4264dd4 100644
--- a/target/config/Config.in.float
+++ b/target/config/Config.in.float
@@ -4,6 +4,7 @@
choice ADK_TARGET_FLOAT_MODE
prompt "Float configuration"
depends on ADK_TARGET_ARCH_ARM || \
+ ADK_TARGET_ARCH_CSKY || \
ADK_TARGET_ARCH_M68K || \
ADK_TARGET_ARCH_MIPS || \
ADK_TARGET_ARCH_NIOS2 || \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 929cf8a..2303e4b 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -122,7 +122,11 @@ GCC_CONFOPTS+= --disable-symvers
endif
ifeq ($(ADK_TARGET_ARCH_CSKY),y)
+ifeq ($(ADK_TARGET_CPU_CSKY_CK610),y)
GCC_CONFOPTS+= --with-cskyabi=abiv1
+else
+GCC_CONFOPTS+= --with-cskyabi=abiv2
+endif
endif
ifeq ($(ADK_TARGET_ARCH_METAG),y)
--
2.7.4
26 Dec
26 Dec
11:03 a.m.
New subject: [PATCH 2/2] csky: update uclibc-ng.config
Signed-off-by: Guo Ren <ren_guo(a)c-sky.com>
---
target/csky/uclibc-ng.config | 65 +++++++++++++++++++++-----------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/target/csky/uclibc-ng.config b/target/csky/uclibc-ng.config
index d593b9f..53754ff 100644
--- a/target/csky/uclibc-ng.config
+++ b/target/csky/uclibc-ng.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.24 C Library Configuration
+# uClibc-ng 1.0.27 C Library Configuration
#
# TARGET_aarch64 is not set
# TARGET_alpha is not set
@@ -27,6 +27,7 @@ TARGET_csky=y
# TARGET_powerpc is not set
# TARGET_sh is not set
# TARGET_sparc is not set
+# TARGET_sparc64 is not set
# TARGET_x86_64 is not set
# TARGET_xtensa is not set
@@ -35,11 +36,6 @@ TARGET_csky=y
#
TARGET_ARCH="csky"
FORCE_OPTIONS_FOR_ARCH=y
-CK610=y
-# CK810 is not set
-# CK807 is not set
-# CONFIG_NDS32_PAGE_SIZE_4K is not set
-# CONFIG_NDS32_PAGE_SIZE_8K is not set
TARGET_SUBARCH=""
#
@@ -55,8 +51,7 @@ ARCH_USE_MMU=y
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
-DO_XSI_MATH=y
-# UCLIBC_HAS_FENV is not set
+# DO_XSI_MATH is not set
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS=""
HAVE_DOT_CONFIG=y
@@ -64,23 +59,23 @@ HAVE_DOT_CONFIG=y
#
# General Library Settings
#
-DOPIC=y
+# DOPIC is not set
HAVE_SHARED=y
# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
LDSO_LDD_SUPPORT=y
LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_ENV_SUPPORT is not set
+LDSO_PRELOAD_ENV_SUPPORT=y
# LDSO_PRELOAD_FILE_SUPPORT is not set
LDSO_BASE_FILENAME="ld.so"
# LDSO_STANDALONE_SUPPORT is not set
# LDSO_PRELINK_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
+UCLIBC_STATIC_LDCONFIG=y
LDSO_RUNPATH=y
-LDSO_RUNPATH_OF_EXECUTABLE=y
+# LDSO_RUNPATH_OF_EXECUTABLE is not set
LDSO_SAFE_RUNPATH=y
LDSO_SEARCH_INTERP_PATH=y
LDSO_LD_LIBRARY_PATH=y
-LDSO_NO_CLEANUP=y
+# LDSO_NO_CLEANUP is not set
UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
@@ -100,7 +95,7 @@ UCLIBC_HAS_UTMPX=y
UCLIBC_HAS_UTMP=y
UCLIBC_SUSV2_LEGACY=y
UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
UCLIBC_SUSV4_LEGACY=y
# UCLIBC_STRICT_HEADERS is not set
# UCLIBC_HAS_STUBS is not set
@@ -110,8 +105,8 @@ UCLIBC_HAS___PROGNAME=y
UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
+# UCLIBC_HAS_GETPT is not set
+# UCLIBC_HAS_LIBUTIL is not set
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -133,14 +128,14 @@ UCLIBC_HAS_GNU_ERROR=y
UCLIBC_BSD_SPECIFIC=y
UCLIBC_HAS_BSD_ERR=y
UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-UCLIBC_SV4_DEPRECATED=y
+UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
+UCLIBC_NTP_LEGACY=y
+# UCLIBC_SV4_DEPRECATED is not set
UCLIBC_HAS_REALTIME=y
UCLIBC_HAS_ADVANCED_REALTIME=y
UCLIBC_HAS_EPOLL=y
UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
UCLIBC_HAS_CRYPT_IMPL=y
UCLIBC_HAS_SHA256_CRYPT_IMPL=y
UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -153,7 +148,7 @@ UCLIBC_USE_NETLINK=y
UCLIBC_SUPPORT_AI_ADDRCONFIG=y
UCLIBC_HAS_BSD_RES_CLOSE=y
UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y
UCLIBC_HAS_RESOLVER_SUPPORT=y
#
@@ -164,15 +159,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 is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
# UCLIBC_HAS_CTYPE_ENFORCED is not set
UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LIBICONV is not set
+UCLIBC_HAS_LIBICONV=y
# UCLIBC_HAS_LIBINTL is not set
# UCLIBC_HAS_LOCALE is not set
UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
@@ -188,10 +183,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=y
-UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
UCLIBC_HAS_ERRNO_MESSAGES=y
# UCLIBC_HAS_SYS_ERRLIST is not set
UCLIBC_HAS_SIGNUM_MESSAGES=y
@@ -217,7 +212,7 @@ UCLIBC_HAS_GNU_GLOB=y
# Library Installation Options
#
RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
+DEVEL_PREFIX="/usr"
MULTILIB_DIR="lib"
HARDWIRED_ABSPATH=y
@@ -225,8 +220,10 @@ HARDWIRED_ABSPATH=y
# Security options
#
# UCLIBC_HAS_ARC4RANDOM is not set
-# UCLIBC_HAS_SSP is not set
-# UCLIBC_BUILD_RELRO is not set
+UCLIBC_HAS_SSP=y
+# SSP_QUICK_CANARY is not set
+# UCLIBC_BUILD_SSP is not set
+UCLIBC_BUILD_RELRO=y
# UCLIBC_BUILD_NOW is not set
UCLIBC_BUILD_NOEXECSTACK=y
@@ -236,11 +233,11 @@ UCLIBC_BUILD_NOEXECSTACK=y
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
-# DOSTRIP is not set
+DOSTRIP=y
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
# UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
+UCLIBC_HAS_BACKTRACE=y
WARNINGS="-Wall"
# EXTRA_WARNINGS is not set
--
2.7.4
27 Dec
27 Dec
8:07 a.m.
New subject: [PATCH 1/2] csky: bugfix csky compile error for abiv1 & abiv2.
Hi Guo,
Guo Ren wrote,
This bugfix is depend on uclibc-ng patch:
csky: remove -mcpu and -mhard-float from config
Signed-off-by: Guo Ren <ren_guo(a)c-sky.com>
Both patches applied and pushed,
Thanks
Waldemar
2322
days inactive
2323
days old
2 comments
2 participants
participants (2)
-
Guo Ren -
Waldemar Brodkorb