leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: do not use i386 code for x86_64 memory functions

Browse Source 
arch/x86/lib/string.c contains assembler implementations of memcpy(),
memmove(), and memset() written for i386. Don't use it on x86_64.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2019-01-23 02:42:39 +01:00 committed by Alexander Graf
parent dba5148049
commit 6b59607f10
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/x86/include/asm/string.h
View File

@ -9,22 +9,37 @@
extern char *strncpy(char *__dest, __const__ char *__src, __kernel_size_t __n); extern char *strncpy(char *__dest, __const__ char *__src, __kernel_size_t __n);
#undef __HAVE_ARCH_STRRCHR #undef __HAVE_ARCH_STRRCHR
extern char * strrchr(const char * s, int c); extern char *strrchr(const char *s, int c);
#undef __HAVE_ARCH_STRCHR #undef __HAVE_ARCH_STRCHR
extern char * strchr(const char * s, int c); extern char *strchr(const char *s, int c);
#ifdef CONFIG_X86_64
#undef __HAVE_ARCH_MEMCPY
extern void *memcpy(void *, const void *, __kernel_size_t);
#undef __HAVE_ARCH_MEMMOVE
extern void *memmove(void *, const void *, __kernel_size_t);
#undef __HAVE_ARCH_MEMSET
extern void *memset(void *, int, __kernel_size_t);
#else
#define __HAVE_ARCH_MEMCPY #define __HAVE_ARCH_MEMCPY
extern void * memcpy(void *, const void *, __kernel_size_t); extern void *memcpy(void *, const void *, __kernel_size_t);
#define __HAVE_ARCH_MEMMOVE #define __HAVE_ARCH_MEMMOVE
extern void * memmove(void *, const void *, __kernel_size_t); extern void *memmove(void *, const void *, __kernel_size_t);
#undef __HAVE_ARCH_MEMCHR
extern void * memchr(const void *, int, __kernel_size_t);
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
extern void * memset(void *, int, __kernel_size_t); extern void *memset(void *, int, __kernel_size_t);
#endif /* CONFIG_X86_64 */
#undef __HAVE_ARCH_MEMCHR
extern void *memchr(const void *, int, __kernel_size_t);
#undef __HAVE_ARCH_MEMZERO #undef __HAVE_ARCH_MEMZERO
extern void memzero(void *ptr, __kernel_size_t n); extern void memzero(void *ptr, __kernel_size_t n);

2
arch/x86/lib/Makefile
View File

@ -7,6 +7,7 @@ ifndef CONFIG_X86_64
obj-y += bios.o obj-y += bios.o
obj-y += bios_asm.o obj-y += bios_asm.o
obj-y += bios_interrupts.o obj-y += bios_interrupts.o
obj-y += string.o
endif endif
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_BOOTM) += bootm.o
@ -32,7 +33,6 @@ obj-$(CONFIG_X86_RAMTEST) += ramtest.o
obj-$(CONFIG_INTEL_MID) += scu.o obj-$(CONFIG_INTEL_MID) += scu.o
obj-y += sections.o obj-y += sections.o
obj-y += sfi.o obj-y += sfi.o
obj-y += string.o
obj-y += acpi.o obj-y += acpi.o
obj-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.o obj-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.o
ifndef CONFIG_QEMU ifndef CONFIG_QEMU