Browse Source

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 <ren_guo@c-sky.com>
Guo Ren 6 years ago
parent
commit
88ee90d706
4 changed files with 9 additions and 0 deletions
  1. 2 0
      scripts/config.sub
  2. 2 0
      target/config/Config.in.cpu
  3. 1 0
      target/config/Config.in.float
  4. 4 0
      toolchain/gcc/Makefile

+ 2 - 0
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-* \

+ 2 - 0
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
 

+ 1 - 0
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 || \

+ 4 - 0
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)