hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csky: Fixup vdsp&fpu issues in kernel 

This fixup is continue to commit 35ff802af1 (csky: fixup remove
vdsp implement for kernel.) and in that patch I didn't finish the
job. We must forbid gcc to generate any vdsp & fpu instructions
and remove vdsp asm in memmove.S.

eg: For GCC it's -mcpu=ck860 and For AS it's -Wa,-mcpu=ck860fv

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
This commit is contained in:
Guo Ren 2019-02-19 12:32:41 +08:00
parent 085b775580
commit 3dfc242f11
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/csky/Makefile
View File

@ -36,7 +36,7 @@ endif
ifneq ($(CSKYABI),) ifneq ($(CSKYABI),)
MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT) MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT)
KBUILD_CFLAGS += -mcpu=$(MCPU_STR) KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR)
KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\" KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\"
KBUILD_CFLAGS += -msoft-float -mdiv KBUILD_CFLAGS += -msoft-float -mdiv
KBUILD_CFLAGS += -fno-tree-vectorize KBUILD_CFLAGS += -fno-tree-vectorize

6
arch/csky/abiv2/memmove.S
View File

@ -35,11 +35,7 @@ ENTRY(memmove)
.L_len_larger_16bytes: .L_len_larger_16bytes:
subi r1, 16 subi r1, 16
subi r0, 16 subi r0, 16
#if defined(__CSKY_VDSPV2__) #if defined(__CK860__)
vldx.8 vr0, (r1), r19
PRE_BNEZAD (r18)
vstx.8 vr0, (r0), r19
#elif defined(__CK860__)
ldw r3, (r1, 12) ldw r3, (r1, 12)
stw r3, (r0, 12) stw r3, (r0, 12)
ldw r3, (r1, 8) ldw r3, (r1, 8)