x86/copy: Add memset symbol size

Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
heatd · Apr 9, 2023 · 58ff98a · 58ff98a
1 parent 98f58a4
commit 58ff98a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/kernel/arch/arm64/make.config b/kernel/arch/arm64/make.config
@@ -6,4 +6,4 @@ KERNEL_ARCH_LDFLAGS:=-z max-page-size=0x1000
 # ARM64 has no crti.o nor crtn.o
 ARCH_NO_CRTI_N:=1
 
-LIBK_ARCH_OBJS:= string/memcpy.o
+LIBK_ARCH_OBJS:= string/memcpy.o string/memset.o
diff --git a/kernel/arch/riscv64/make.config b/kernel/arch/riscv64/make.config
@@ -16,4 +16,4 @@ KERNEL_ARCH_LDFLAGS:=-z max-page-size=0x1000
 # RISCV has no crti.o nor crtn.o
 ARCH_NO_CRTI_N:=1
 
-LIBK_ARCH_OBJS:= string/memcpy.o
+LIBK_ARCH_OBJS:= string/memcpy.o string/memset.o
diff --git a/kernel/arch/x86_64/copy.S b/kernel/arch/x86_64/copy.S
@@ -85,9 +85,9 @@ __set_non_temporal:
 
     RET
 
-.global memset
-.type memset, @function
-memset:
+.global __memset
+.type __memset, @function
+__memset:
     push %rbp
     mov %rsp, %rbp
 
@@ -104,3 +104,8 @@ memset:
 
     pop %rbp
     RET
+
+.size __memset, . - __memset 
+
+.weak memset
+.set memset, __memset
diff --git a/kernel/lib/libk/Makefile b/kernel/lib/libk/Makefile
@@ -2,7 +2,6 @@ LIBK_OBJS:=\
 stdio/printf.o \
 stdio/puts.o \
 string/memcmp.o \
-string/memset.o \
 string/strlen.o \
 string/strcpy.o \
 string/strcmp.o \