diff --git a/libc/src/wchar/CMakeLists.txt b/libc/src/wchar/CMakeLists.txt index 759f708c2247..4b8802ede5f5 100644 --- a/libc/src/wchar/CMakeLists.txt +++ b/libc/src/wchar/CMakeLists.txt @@ -43,7 +43,6 @@ add_entrypoint_object( DEPENDS libc.hdr.types.size_t libc.hdr.types.wchar_t - libc.src.__support.wctype_utils ) add_entrypoint_object( @@ -54,7 +53,6 @@ add_entrypoint_object( wcschr.h DEPENDS libc.hdr.wchar_macros - libc.src.__support.wctype_utils ) add_entrypoint_object( @@ -75,7 +73,6 @@ add_entrypoint_object( wcspbrk.h DEPENDS libc.hdr.wchar_macros - libc.src.__support.wctype_utils libc.src.__support.macros.null_check ) @@ -109,7 +106,6 @@ add_entrypoint_object( DEPENDS libc.hdr.wchar_macros libc.hdr.types.size_t - libc.src.__support.wctype_utils ) add_entrypoint_object( @@ -121,7 +117,6 @@ add_entrypoint_object( DEPENDS libc.hdr.types.size_t libc.hdr.wchar_macros - libc.src.__support.wctype_utils libc.src.__support.macros.null_check ) @@ -134,7 +129,6 @@ add_entrypoint_object( DEPENDS libc.hdr.types.size_t libc.hdr.wchar_macros - libc.src.__support.wctype_utils ) add_entrypoint_object( @@ -205,8 +199,6 @@ add_entrypoint_object( DEPENDS libc.hdr.types.size_t libc.hdr.wchar_macros - libc.src.__support.wctype_utils - libc.src.string.memory_utils.inline_memcpy ) add_entrypoint_object( @@ -218,6 +210,5 @@ add_entrypoint_object( DEPENDS libc.hdr.types.size_t libc.hdr.wchar_macros - libc.src.string.memory_utils.inline_memcpy libc.src.string.string_utils ) diff --git a/libc/src/wchar/wcscpy.cpp b/libc/src/wchar/wcscpy.cpp index dc46b972c59f..01ba994cecbb 100644 --- a/libc/src/wchar/wcscpy.cpp +++ b/libc/src/wchar/wcscpy.cpp @@ -12,7 +12,6 @@ #include "hdr/types/wchar_t.h" #include "src/__support/common.h" #include "src/__support/macros/config.h" -#include "src/string/memory_utils/inline_memcpy.h" #include "src/string/string_utils.h" namespace LIBC_NAMESPACE_DECL { @@ -20,7 +19,7 @@ namespace LIBC_NAMESPACE_DECL { LLVM_LIBC_FUNCTION(wchar_t *, wcscpy, (wchar_t *__restrict s1, const wchar_t *__restrict s2)) { size_t size = internal::string_length(s2) + 1; - inline_memcpy(s1, s2, size * sizeof(wchar_t)); + __builtin_memcpy(s1, s2, size * sizeof(wchar_t)); return s1; } diff --git a/libc/src/wchar/wcsncpy.cpp b/libc/src/wchar/wcsncpy.cpp index e7ae9a4a0da7..7ad6730cd776 100644 --- a/libc/src/wchar/wcsncpy.cpp +++ b/libc/src/wchar/wcsncpy.cpp @@ -12,8 +12,6 @@ #include "hdr/types/wchar_t.h" #include "src/__support/common.h" #include "src/__support/macros/config.h" -#include "src/string/memory_utils/inline_memcpy.h" -#include "src/string/string_utils.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/wchar/wmemcpy.cpp b/libc/src/wchar/wmemcpy.cpp index 56708d6cee49..bf92309b2094 100644 --- a/libc/src/wchar/wmemcpy.cpp +++ b/libc/src/wchar/wmemcpy.cpp @@ -12,14 +12,13 @@ #include "hdr/types/wchar_t.h" #include "src/__support/common.h" #include "src/__support/macros/config.h" -#include "src/string/memory_utils/inline_memcpy.h" namespace LIBC_NAMESPACE_DECL { LLVM_LIBC_FUNCTION(wchar_t *, wmemcpy, (wchar_t *__restrict s1, const wchar_t *__restrict s2, size_t n)) { - inline_memcpy(s1, s2, n * sizeof(wchar_t)); + __builtin_memcpy(s1, s2, n * sizeof(wchar_t)); return s1; } diff --git a/libc/src/wchar/wmempcpy.cpp b/libc/src/wchar/wmempcpy.cpp index d8b89c0a88d0..21e16210a757 100644 --- a/libc/src/wchar/wmempcpy.cpp +++ b/libc/src/wchar/wmempcpy.cpp @@ -11,14 +11,13 @@ #include "hdr/types/size_t.h" #include "hdr/types/wchar_t.h" #include "src/__support/common.h" -#include "src/string/memory_utils/inline_memcpy.h" namespace LIBC_NAMESPACE_DECL { LLVM_LIBC_FUNCTION(wchar_t *, wmempcpy, (wchar_t *__restrict to, const wchar_t *__restrict from, size_t size)) { - inline_memcpy(to, from, size * sizeof(wchar_t)); + __builtin_memcpy(to, from, size * sizeof(wchar_t)); return reinterpret_cast(to) + size; }