Skip to content

Commit

Permalink
csky: abiv1: Fixup compile error
Browse files Browse the repository at this point in the history
  LD      vmlinux.o
arch/csky/lib/string.o: In function `memmove':
string.c:(.text+0x108): multiple definition of `memmove'
lib/string.o:string.c:(.text+0x7e8): first defined here
arch/csky/lib/string.o: In function `memset':
string.c:(.text+0x148): multiple definition of `memset'
lib/string.o:string.c:(.text+0x2ac): first defined here
scripts/Makefile.vmlinux_o:68: recipe for target 'vmlinux.o' failed
make[4]: *** [vmlinux.o] Error 1

Fixes: e4df2d5 ("csky: Add C based string functions")
Signed-off-by: Guo Ren <[email protected]>
Signed-off-by: Guo Ren <[email protected]>
Cc: <[email protected]>
  • Loading branch information
guoren83 committed Aug 1, 2022
1 parent f940dc0 commit 45fef4c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/csky/abiv1/inc/abi/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@
#define __HAVE_ARCH_MEMCPY
extern void *memcpy(void *, const void *, __kernel_size_t);

#define __HAVE_ARCH_MEMMOVE
extern void *memmove(void *, const void *, __kernel_size_t);

#define __HAVE_ARCH_MEMSET
extern void *memset(void *, int, __kernel_size_t);

#endif /* __ABI_CSKY_STRING_H */

0 comments on commit 45fef4c

Please sign in to comment.