From 88ee90d7060f7be2f20fdb79d4fa177fb8601b9d Mon Sep 17 00:00:00 2001 From: Guo Ren Date: Tue, 26 Dec 2017 19:03:18 +0800 Subject: csky: bugfix csky compile error for abiv1 & abiv2. This bugfix is depend on uclibc-ng patch: csky: remove -mcpu and -mhard-float from config Signed-off-by: Guo Ren --- 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 63331236c..6c22a0f56 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 b7d17d942..77328d8ec 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 842b38f0b..4264dd437 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 929cf8a79..2303e4b90 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) -- cgit v1.2.3