diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt --- a/libc/config/linux/aarch64/entrypoints.txt +++ b/libc/config/linux/aarch64/entrypoints.txt @@ -91,6 +91,10 @@ libc.src.stdlib.realloc libc.src.stdlib.free + # stdio.h entrypoints + libc.src.stdio.sprintf + libc.src.stdio.snprintf + # sys/stat.h entrypoints libc.src.sys.stat.mkdir libc.src.sys.stat.mkdirat @@ -242,8 +246,6 @@ libc.src.stdio.funlockfile libc.src.stdio.fwrite libc.src.stdio.fwrite_unlocked - libc.src.stdio.sprintf - libc.src.stdio.snprintf libc.src.stdio.fprintf libc.src.stdio.printf libc.src.stdio.stderr diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -92,6 +92,10 @@ libc.src.stdlib.aligned_alloc libc.src.stdlib.free + # stdio.h entrypoints + libc.src.stdio.sprintf + libc.src.stdio.snprintf + # sys/mman.h entrypoints libc.src.sys.mman.mmap libc.src.sys.mman.munmap @@ -298,8 +302,6 @@ libc.src.stdio.funlockfile libc.src.stdio.fwrite libc.src.stdio.fwrite_unlocked - libc.src.stdio.sprintf - libc.src.stdio.snprintf libc.src.stdio.fprintf libc.src.stdio.printf libc.src.stdio.stderr diff --git a/libc/src/CMakeLists.txt b/libc/src/CMakeLists.txt --- a/libc/src/CMakeLists.txt +++ b/libc/src/CMakeLists.txt @@ -7,6 +7,7 @@ add_subdirectory(math) add_subdirectory(string) add_subdirectory(stdlib) +add_subdirectory(stdio) if(${LIBC_TARGET_OS} STREQUAL "linux") add_subdirectory(dirent) @@ -24,6 +25,5 @@ # since assert uses the signal API, we disable assert also. # add_subdirectory(assert) # add_subdirectory(signal) -add_subdirectory(stdio) add_subdirectory(threads) add_subdirectory(time) diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt --- a/libc/test/src/CMakeLists.txt +++ b/libc/test/src/CMakeLists.txt @@ -34,6 +34,7 @@ add_subdirectory(math) add_subdirectory(string) add_subdirectory(stdlib) +add_subdirectory(stdio) if(${LIBC_TARGET_OS} STREQUAL "linux") add_subdirectory(fcntl) @@ -50,7 +51,6 @@ # since assert uses the signal API, we disable assert also. # add_subdirectory(assert) # add_subdirectory(signal) -add_subdirectory(stdio) add_subdirectory(time) if(${LIBC_TARGET_OS} STREQUAL "linux") diff --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/utils/UnitTest/CMakeLists.txt --- a/libc/utils/UnitTest/CMakeLists.txt +++ b/libc/utils/UnitTest/CMakeLists.txt @@ -54,13 +54,6 @@ libc.src.__support.CPP.array_ref ) -if(NOT LLVM_LIBC_FULL_BUILD) # TODO(michaelrj): make a more permanant solution. - return() -endif() - -#currently stdio is fullbuild only, so this matcher that depends on a piece of -#printf also has to be fullbuild only. - add_library( LibcPrintfHelpers PrintfMatcher.h