diff --git a/libc/loader/linux/x86_64/CMakeLists.txt b/libc/loader/linux/x86_64/CMakeLists.txt index e445e30b61979c..6c2e615290fa1e 100644 --- a/libc/loader/linux/x86_64/CMakeLists.txt +++ b/libc/loader/linux/x86_64/CMakeLists.txt @@ -7,7 +7,7 @@ add_loader_object( libc.include.sys_mman libc.include.sys_syscall libc.src.__support.OSUtil.osutil - libc.src.string.memcpy + libc.src.string.memory_utils.memcpy_implementation COMPILE_OPTIONS -fno-omit-frame-pointer -ffreestanding # To avoid compiler warnings about calling the main function. diff --git a/libc/loader/linux/x86_64/start.cpp b/libc/loader/linux/x86_64/start.cpp index d97c9bc9ae30a9..ef413c0e5ffb20 100644 --- a/libc/loader/linux/x86_64/start.cpp +++ b/libc/loader/linux/x86_64/start.cpp @@ -8,7 +8,7 @@ #include "config/linux/app.h" #include "src/__support/OSUtil/syscall.h" -#include "src/string/memcpy.h" +#include "src/string/memory_utils/memcpy_implementations.h" #include #include @@ -64,8 +64,9 @@ void initTLS() { uintptr_t endPtr = reinterpret_cast(tlsAddr) + tlsSize; *reinterpret_cast(endPtr) = endPtr; - __llvm_libc::memcpy(tlsAddr, reinterpret_cast(app.tls.address), - app.tls.size); + __llvm_libc::inline_memcpy(reinterpret_cast(tlsAddr), + reinterpret_cast(app.tls.address), + app.tls.size); if (__llvm_libc::syscall(SYS_arch_prctl, ARCH_SET_FS, endPtr) == -1) __llvm_libc::syscall(SYS_exit, 1); } diff --git a/libc/src/stdlib/CMakeLists.txt b/libc/src/stdlib/CMakeLists.txt index 77a407347542b0..9201c7f521281a 100644 --- a/libc/src/stdlib/CMakeLists.txt +++ b/libc/src/stdlib/CMakeLists.txt @@ -46,7 +46,6 @@ add_entrypoint_object( getenv.h DEPENDS libc.config.linux.app_h - libc.src.string.strncmp ) add_entrypoint_object(