diff --git a/libc/config/gpu/entrypoints.txt b/libc/config/gpu/entrypoints.txt --- a/libc/config/gpu/entrypoints.txt +++ b/libc/config/gpu/entrypoints.txt @@ -62,7 +62,6 @@ libc.src.stdlib.atoll libc.src.stdlib.labs libc.src.stdlib.llabs - libc.src.stdlib.atexit libc.src.stdlib.strtod libc.src.stdlib.strtof libc.src.stdlib.strtol @@ -71,6 +70,11 @@ libc.src.stdlib.strtoul libc.src.stdlib.strtoull + # stdlib.h entrypoints + libc.src.stdlib._Exit + libc.src.stdlib.atexit + libc.src.stdlib.exit + # Only implemented in the test suite libc.src.stdlib.malloc libc.src.stdlib.aligned_alloc diff --git a/libc/src/stdlib/CMakeLists.txt b/libc/src/stdlib/CMakeLists.txt --- a/libc/src/stdlib/CMakeLists.txt +++ b/libc/src/stdlib/CMakeLists.txt @@ -313,9 +313,13 @@ add_entrypoint_object( _Exit - ALIAS + SRCS + _Exit.cpp + HDRS + _Exit.h DEPENDS - .${LIBC_TARGET_OS}._Exit + libc.include.stdlib + libc.src.__support.OSUtil.osutil ) add_entrypoint_object( @@ -341,6 +345,7 @@ DEPENDS ._Exit .atexit + libc.src.__support.OSUtil.osutil ) add_entrypoint_object( diff --git a/libc/src/stdlib/linux/_Exit.cpp b/libc/src/stdlib/_Exit.cpp rename from libc/src/stdlib/linux/_Exit.cpp rename to libc/src/stdlib/_Exit.cpp --- a/libc/src/stdlib/linux/_Exit.cpp +++ b/libc/src/stdlib/_Exit.cpp @@ -1,4 +1,4 @@ -//===------------------- Linux Implementation of _Exit --------------------===// +//===------------------- Implementation of _Exit --------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,8 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "include/sys/syscall.h" // For syscall numbers. -#include "src/__support/OSUtil/syscall.h" // For internal syscall function. +#include "src/__support/OSUtil/quick_exit.h" #include "src/__support/common.h" #include "src/stdlib/_Exit.h" @@ -15,10 +14,8 @@ namespace __llvm_libc { LLVM_LIBC_FUNCTION(void, _Exit, (int status)) { - for (;;) { - __llvm_libc::syscall_impl(SYS_exit_group, status); - __llvm_libc::syscall_impl(SYS_exit, status); - } + quick_exit(status); + __builtin_unreachable(); } } // namespace __llvm_libc diff --git a/libc/src/stdlib/exit.cpp b/libc/src/stdlib/exit.cpp --- a/libc/src/stdlib/exit.cpp +++ b/libc/src/stdlib/exit.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "src/stdlib/exit.h" +#include "src/__support/OSUtil/quick_exit.h" #include "src/__support/common.h" -#include "src/stdlib/_Exit.h" namespace __llvm_libc { @@ -18,7 +18,7 @@ LLVM_LIBC_FUNCTION(void, exit, (int status)) { internal::call_exit_callbacks(); - _Exit(status); + quick_exit(status); } } // namespace __llvm_libc diff --git a/libc/src/stdlib/linux/CMakeLists.txt b/libc/src/stdlib/linux/CMakeLists.txt --- a/libc/src/stdlib/linux/CMakeLists.txt +++ b/libc/src/stdlib/linux/CMakeLists.txt @@ -1,15 +1,3 @@ -add_entrypoint_object( - _Exit - SRCS - _Exit.cpp - HDRS - ../_Exit.h - DEPENDS - libc.include.sys_syscall - libc.include.stdlib - libc.src.__support.OSUtil.osutil -) - add_entrypoint_object( abort SRCS