[libc] remove errno.h includes (#110934)

libc/include/llvm-libc-macros/linux/error-number-macros.h

@@ -21,4 +21,12 @@
 #define EHWPOISON 133
 #endif // EHWPOISON
 
+#ifndef EOPNOTSUPP
+#define EOPNOTSUPP 95
+#endif
+
+#ifndef ENOTSUP
+#define ENOTSUP EOPNOTSUPP
+#endif
+
 #endif // LLVM_LIBC_MACROS_LINUX_ERROR_NUMBER_MACROS_H

libc/src/__support/StringUtil/tables/CMakeLists.txt

@@ -3,7 +3,7 @@ add_header_library(
   HDRS
     stdc_errors.h
   DEPENDS
-    libc.include.errno
+    libc.src.errno.errno
     libc.src.__support.StringUtil.message_mapper
 )
 
@@ -12,7 +12,7 @@ add_header_library(
   HDRS
     posix_errors.h
   DEPENDS
-    libc.include.errno
+    libc.src.errno.errno
     libc.src.__support.StringUtil.message_mapper
 )
 
@@ -21,8 +21,8 @@ add_header_library(
   HDRS
     linux_extension_errors.h
   DEPENDS
-    libc.include.errno
     libc.src.__support.StringUtil.message_mapper
+    libc.src.errno.errno
 )
 
 add_header_library(

libc/src/__support/StringUtil/tables/linux_extension_errors.h

@@ -11,8 +11,7 @@
 
 #include "src/__support/StringUtil/message_mapper.h"
 #include "src/__support/macros/config.h"
-
-#include <errno.h> // For error macros
+#include "src/errno/libc_errno.h"
 
 namespace LIBC_NAMESPACE_DECL {
 

libc/src/__support/StringUtil/tables/posix_errors.h

@@ -9,11 +9,10 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_POSIX_ERRORS_H
 #define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_POSIX_ERRORS_H
 
+#include "hdr/errno_macros.h"
 #include "src/__support/StringUtil/message_mapper.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h> // For error macros
-
 namespace LIBC_NAMESPACE_DECL {
 
 LIBC_INLINE_VAR constexpr MsgTable<76> POSIX_ERRORS = {

libc/src/__support/StringUtil/tables/stdc_errors.h

@@ -12,8 +12,6 @@
 #include "src/__support/StringUtil/message_mapper.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h> // For error macros
-
 namespace LIBC_NAMESPACE_DECL {
 
 LIBC_INLINE_VAR constexpr const MsgTable<4> STDC_ERRORS = {

libc/src/math/generic/CMakeLists.txt

@@ -1372,7 +1372,6 @@ add_entrypoint_object(
   DEPENDS
     .common_constants
     .explogxf
-    libc.include.errno
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.optional
     libc.src.__support.FPUtil.dyadic_float
@@ -1406,7 +1405,6 @@ add_entrypoint_object(
     libc.src.__support.FPUtil.polyeval
     libc.src.__support.FPUtil.rounding_mode
     libc.src.__support.macros.optimization
-    libc.include.errno
     libc.src.errno.errno
   COMPILE_OPTIONS
     -O3
@@ -1445,7 +1443,6 @@ add_entrypoint_object(
   DEPENDS
     .common_constants
     .explogxf
-    libc.include.errno
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.optional
     libc.src.__support.FPUtil.dyadic_float
@@ -1478,7 +1475,6 @@ add_header_library(
     libc.src.__support.FPUtil.rounding_mode
     libc.src.__support.macros.optimization
     libc.src.__support.common
-    libc.include.errno
     libc.src.errno.errno
 )
 
@@ -1548,7 +1544,6 @@ add_entrypoint_object(
   DEPENDS
     .common_constants
     .explogxf
-    libc.include.errno
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.optional
     libc.src.__support.FPUtil.dyadic_float
@@ -1580,7 +1575,6 @@ add_header_library(
     libc.src.__support.FPUtil.rounding_mode
     libc.src.__support.macros.optimization
     libc.src.__support.common
-    libc.include.errno
     libc.src.errno.errno
   COMPILE_OPTIONS
     -O3
@@ -1632,7 +1626,6 @@ add_entrypoint_object(
   DEPENDS
     .common_constants
     .explogxf
-    libc.include.errno
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.optional
     libc.src.__support.FPUtil.dyadic_float
@@ -1666,7 +1659,6 @@ add_entrypoint_object(
     libc.src.__support.FPUtil.polyeval
     libc.src.__support.FPUtil.rounding_mode
     libc.src.__support.macros.optimization
-    libc.include.errno
     libc.src.errno.errno
   COMPILE_OPTIONS
     -O3
@@ -1705,7 +1697,6 @@ add_entrypoint_object(
     .exp10f_impl
     .exp2f_impl
     .explogxf
-    libc.include.errno
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.optional
     libc.src.__support.FPUtil.fenv_impl
@@ -4144,7 +4135,6 @@ add_object_library(
     libc.src.__support.FPUtil.nearest_integer
     libc.src.__support.FPUtil.polyeval
     libc.src.__support.common
-    libc.include.errno
     libc.src.errno.errno
   COMPILE_OPTIONS
     -O3

libc/src/math/generic/acosf.cpp

@@ -16,8 +16,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 #include "inv_trigf_utils.h"
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/math/generic/asinf.cpp

@@ -17,8 +17,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 #include "inv_trigf_utils.h"
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/math/generic/cosf.cpp

@@ -18,8 +18,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Exceptional cases for cosf.

libc/src/math/generic/exp.cpp

@@ -25,8 +25,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 using fputil::DoubleDouble;

libc/src/math/generic/exp10.cpp

@@ -25,8 +25,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 using fputil::DoubleDouble;

libc/src/math/generic/exp10f_impl.h

@@ -21,8 +21,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace generic {
 

libc/src/math/generic/exp2.cpp

@@ -25,8 +25,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 using fputil::DoubleDouble;

libc/src/math/generic/exp2f_impl.h

@@ -21,8 +21,6 @@
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h"
 
-#include <errno.h>
-
 #include "explogxf.h"
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/math/generic/expf.cpp

@@ -19,8 +19,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float, expf, (float x)) {

libc/src/math/generic/explogxf.h

@@ -20,8 +20,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/cpu_features.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 struct ExpBase {

libc/src/math/generic/expm1f.cpp

@@ -21,8 +21,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float, expm1f, (float x)) {

libc/src/math/generic/powf.cpp

@@ -25,8 +25,6 @@
 #include "exp10f_impl.h" // Speedup for powf(10, y) = exp10f(y)
 #include "exp2f_impl.h"  // Speedup for powf(2, y) = exp2f(y)
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 using fputil::DoubleDouble;

libc/src/math/generic/sincosf.cpp

@@ -17,8 +17,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Exceptional values

libc/src/math/generic/sinf.cpp

@@ -19,8 +19,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 #if defined(LIBC_TARGET_CPU_HAS_FMA)
 #include "range_reduction_fma.h"
 #else

libc/src/math/generic/tanf.cpp

@@ -19,8 +19,6 @@
 #include "src/__support/macros/optimization.h"            // LIBC_UNLIKELY
 #include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Exceptional cases for tanf.

libc/src/pthread/CMakeLists.txt

@@ -36,6 +36,7 @@ add_entrypoint_object(
     pthread_attr_setdetachstate.h
   DEPENDS
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -56,6 +57,7 @@ add_entrypoint_object(
     pthread_attr_setguardsize.h
   DEPENDS
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -76,6 +78,7 @@ add_entrypoint_object(
     pthread_attr_setstacksize.h
   DEPENDS
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -98,6 +101,7 @@ add_entrypoint_object(
   DEPENDS
     libc.include.pthread
     libc.src.pthread.pthread_attr_setstacksize
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -149,10 +153,10 @@ add_entrypoint_object(
   HDRS
     pthread_condattr_setclock.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.include.sys_types
     libc.include.time
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -163,6 +167,7 @@ add_entrypoint_object(
     pthread_condattr_setpshared.h
   DEPENDS
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_header_library(
@@ -205,6 +210,7 @@ add_entrypoint_object(
   DEPENDS
     .pthread_mutexattr
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -215,7 +221,7 @@ add_entrypoint_object(
     pthread_mutexattr_destroy.h
   DEPENDS
     .pthread_mutexattr
-    libc.include.errno
+    libc.src.errno.errno
     libc.include.pthread
 )
 
@@ -238,8 +244,8 @@ add_entrypoint_object(
     pthread_mutexattr_setrobust.h
   DEPENDS
     .pthread_mutexattr
-    libc.include.errno
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -261,8 +267,8 @@ add_entrypoint_object(
     pthread_mutexattr_setpshared.h
   DEPENDS
     .pthread_mutexattr
-    libc.include.errno
     libc.include.pthread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -273,7 +279,7 @@ add_entrypoint_object(
     pthread_mutex_init.h
   DEPENDS
     .pthread_mutexattr
-    libc.include.errno
+    libc.src.errno.errno
     libc.include.pthread
     libc.src.__support.threads.mutex
 )
@@ -318,7 +324,6 @@ add_entrypoint_object(
   HDRS
     pthread_create.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.__support.threads.thread
     libc.src.pthread.pthread_attr_destroy
@@ -326,6 +331,7 @@ add_entrypoint_object(
     libc.src.pthread.pthread_attr_getdetachstate
     libc.src.pthread.pthread_attr_getguardsize
     libc.src.pthread.pthread_attr_getstack
+    libc.src.errno.errno
   COMPILE_OPTIONS
     -O3
     -fno-omit-frame-pointer
@@ -419,9 +425,9 @@ add_entrypoint_object(
   HDRS
     pthread_key_create.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.__support.threads.thread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -431,9 +437,9 @@ add_entrypoint_object(
   HDRS
     pthread_key_delete.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.__support.threads.thread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -443,8 +449,8 @@ add_entrypoint_object(
   HDRS
     pthread_getspecific.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
+    libc.src.errno.errno
     libc.src.__support.threads.thread
 )
 
@@ -455,9 +461,9 @@ add_entrypoint_object(
   HDRS
     pthread_setspecific.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.__support.threads.thread
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -508,7 +514,7 @@ add_entrypoint_object(
     pthread_rwlockattr_setkind_np.h
   DEPENDS
     libc.include.pthread
-    libc.include.errno
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -519,7 +525,7 @@ add_entrypoint_object(
     pthread_rwlockattr_setpshared.h
   DEPENDS
     libc.include.pthread
-    libc.include.errno
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -554,6 +560,7 @@ add_entrypoint_object(
   DEPENDS
     libc.include.pthread
     libc.src.__support.threads.linux.rwlock
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -587,6 +594,7 @@ add_entrypoint_object(
   DEPENDS
     libc.include.pthread
     libc.src.__support.threads.linux.rwlock
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -631,6 +639,7 @@ add_entrypoint_object(
   DEPENDS
     libc.include.pthread
     libc.src.__support.threads.linux.rwlock
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -727,7 +736,7 @@ add_entrypoint_object(
   HDRS
     pthread_atfork.h
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.__support.threads.fork_callbacks
+    libc.src.errno.errno
 )

libc/src/pthread/pthread_atfork.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/fork_callbacks.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h> // For pthread_* type definitions.
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_attr_setdetachstate.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_attr_setguardsize.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <linux/param.h> // For EXEC_PAGESIZE.
 #include <pthread.h>
 

libc/src/pthread/pthread_attr_setstack.cpp

@@ -12,8 +12,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/thread.h" // For STACK_ALIGNMENT
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 #include <stdint.h>
 

libc/src/pthread/pthread_attr_setstacksize.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_condattr_setclock.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>     // EINVAL
 #include <pthread.h>   // pthread_condattr_t
 #include <sys/types.h> // clockid_t
 #include <time.h>      // CLOCK_MONOTONIC, CLOCK_REALTIME

libc/src/pthread/pthread_condattr_setpshared.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h> // EINVAL
 #include <pthread.h> // pthread_condattr_t, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_create.cpp

@@ -19,8 +19,8 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h"
 #include "src/__support/threads/thread.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h> // For pthread_* type definitions.
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_key_create.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/thread.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_key_delete.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/thread.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_mutex_init.cpp

@@ -13,7 +13,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/mutex.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_mutexattr_destroy.cpp

@@ -12,8 +12,6 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, pthread_mutexattr_destroy, (pthread_mutexattr_t *)) {

libc/src/pthread/pthread_mutexattr_getpshared.cpp

@@ -12,8 +12,6 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getpshared,

libc/src/pthread/pthread_mutexattr_getrobust.cpp

@@ -12,8 +12,6 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getrobust,

libc/src/pthread/pthread_mutexattr_gettype.cpp

@@ -12,8 +12,6 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, pthread_mutexattr_gettype,

libc/src/pthread/pthread_mutexattr_setpshared.cpp

@@ -11,8 +11,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_mutexattr_setrobust.cpp

@@ -11,8 +11,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_mutexattr_settype.cpp

@@ -11,8 +11,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_destroy.cpp

@@ -12,7 +12,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_init.cpp

@@ -14,7 +14,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_rdlock.cpp

@@ -12,7 +12,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_timedrdlock.cpp

@@ -7,15 +7,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/pthread/pthread_rwlock_timedrdlock.h"
-
 #include "src/__support/common.h"
 #include "src/__support/libc_assert.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h"
 #include "src/__support/threads/linux/rwlock.h"
 #include "src/__support/time/linux/abs_timeout.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_timedwrlock.cpp

@@ -15,7 +15,6 @@
 #include "src/__support/threads/linux/rwlock.h"
 #include "src/__support/time/linux/abs_timeout.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_tryrdlock.cpp

@@ -12,7 +12,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_trywrlock.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_unlock.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlock_wrlock.cpp

@@ -12,7 +12,6 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlockattr_setkind_np.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h> // pthread_rwlockattr_t
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_rwlockattr_setpshared.cpp

@@ -10,8 +10,8 @@
 
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h> // EINVAL
 #include <pthread.h> // pthread_rwlockattr_t, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/pthread/pthread_setspecific.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/thread.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <pthread.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/spawn/CMakeLists.txt

@@ -28,9 +28,9 @@ add_entrypoint_object(
     posix_spawn_file_actions_destroy.h
   DEPENDS
     .file_actions
-    libc.include.errno
     libc.include.spawn
     libc.src.__support.CPP.new
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -41,9 +41,9 @@ add_entrypoint_object(
     posix_spawn_file_actions_adddup2.h
   DEPENDS
     .file_actions
-    libc.include.errno
     libc.include.spawn
     libc.src.__support.CPP.new
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -54,9 +54,9 @@ add_entrypoint_object(
     posix_spawn_file_actions_addopen.h
   DEPENDS
     .file_actions
-    libc.include.errno
     libc.include.spawn
     libc.src.__support.CPP.new
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(
@@ -67,9 +67,9 @@ add_entrypoint_object(
     posix_spawn_file_actions_addclose.h
   DEPENDS
     .file_actions
-    libc.include.errno
     libc.include.spawn
     libc.src.__support.CPP.new
+    libc.src.errno.errno
 )
 
 add_entrypoint_object(

libc/src/spawn/posix_spawn_file_actions_addclose.cpp

@@ -12,8 +12,8 @@
 #include "src/__support/CPP/new.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <spawn.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/spawn/posix_spawn_file_actions_adddup2.cpp

@@ -12,8 +12,8 @@
 #include "src/__support/CPP/new.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <spawn.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/spawn/posix_spawn_file_actions_addopen.cpp

@@ -12,8 +12,8 @@
 #include "src/__support/CPP/new.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <spawn.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/spawn/posix_spawn_file_actions_destroy.cpp

@@ -9,11 +9,12 @@
 #include "posix_spawn_file_actions_destroy.h"
 
 #include "file_actions.h"
+
 #include "src/__support/CPP/new.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <spawn.h>
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/threads/CMakeLists.txt

@@ -22,6 +22,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.__support.threads.thread
     libc.include.threads
+    libc.src.errno.errno
   COMPILE_OPTIONS
     -O3
     -fno-omit-frame-pointer # This allows us to sniff out the thread args from

libc/src/threads/thrd_create.cpp

@@ -10,8 +10,8 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/thread.h"
+#include "src/errno/libc_errno.h"
 
-#include <errno.h>
 #include <threads.h> // For thrd_* type definitions.
 
 namespace LIBC_NAMESPACE_DECL {

libc/test/UnitTest/PrintfMatcher.h

@@ -13,8 +13,6 @@
 #include "src/stdio/printf_core/core_structs.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace testing {
 

libc/test/UnitTest/ScanfMatcher.h

@@ -13,8 +13,6 @@
 #include "src/stdio/scanf_core/core_structs.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace testing {
 

libc/test/integration/src/pthread/CMakeLists.txt

@@ -115,7 +115,6 @@ add_integration_test(
   SRCS
     pthread_name_test.cpp
   DEPENDS
-    libc.include.errno
     libc.include.pthread
     libc.src.errno.errno
     libc.src.pthread.pthread_create
@@ -185,8 +184,8 @@ add_integration_test(
     pthread_join_test.cpp
   DEPENDS
     libc.include.pthread
-    libc.include.errno
     libc.include.stdio
+    libc.src.errno.errno
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_join
 )
@@ -199,7 +198,7 @@ add_integration_test(
     pthread_create_test.cpp
   DEPENDS
     libc.include.pthread
-    libc.include.errno
+    libc.src.errno.errno
     libc.src.pthread.pthread_create
     libc.src.pthread.pthread_join
     libc.src.pthread.pthread_attr_getdetachstate

libc/test/integration/src/pthread/pthread_name_test.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/__support/CPP/string_view.h"
+#include "src/errno/libc_errno.h"
 #include "src/pthread/pthread_create.h"
 #include "src/pthread/pthread_getname_np.h"
 #include "src/pthread/pthread_join.h"
@@ -19,7 +20,6 @@
 
 #include "test/IntegrationTest/test.h"
 
-#include <errno.h>
 #include <pthread.h>
 #include <stdint.h> // uintptr_t
 

libc/test/integration/src/spawn/posix_spawn_test_binary.cpp

@@ -1,5 +1,4 @@
 #include "test_binary_properties.h"
-#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 

libc/test/integration/src/unistd/CMakeLists.txt

@@ -21,10 +21,10 @@ add_integration_test(
   SRCS
     fork_test.cpp
   DEPENDS
-    libc.include.errno
     libc.include.signal
     libc.include.sys_wait
     libc.include.unistd
+    libc.src.errno.errno
     libc.src.pthread.pthread_atfork
     libc.src.signal.raise
     libc.src.sys.wait.wait
@@ -45,11 +45,11 @@ if((${LIBC_TARGET_OS} STREQUAL "linux") AND (${LIBC_TARGET_ARCHITECTURE_IS_X86})
     SRCS
       stack_smashing_test.cpp
     DEPENDS
-      libc.include.errno
       libc.include.signal
       libc.include.sys_wait
       libc.include.unistd
       libc.src.compiler.__stack_chk_fail
+      libc.src.errno.errno
       libc.src.pthread.pthread_atfork
       libc.src.signal.raise
       libc.src.sys.wait.wait
@@ -94,7 +94,7 @@ add_integration_test(
   DEPENDS
     libc_execv_test_normal_exit
     libc_execv_test_signal_exit
-    libc.include.errno
+    libc.src.errno.errno
     libc.src.sys.wait.waitpid
     libc.src.unistd.execv
     libc.src.unistd.fork
@@ -111,7 +111,7 @@ add_integration_test(
   DEPENDS
     libc_execv_test_normal_exit
     libc_execv_test_signal_exit
-    libc.include.errno
+    libc.errno.errno
     libc.src.sys.wait.waitpid
     libc.src.unistd.execve
     libc.src.unistd.fork

libc/test/integration/src/unistd/fork_test.cpp

@@ -18,7 +18,6 @@
 
 #include "test/IntegrationTest/test.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <sys/syscall.h>
 #include <sys/wait.h>

libc/test/integration/src/unistd/stack_smashing_test.cpp

@@ -17,7 +17,6 @@
 
 #include "test/IntegrationTest/test.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <unistd.h>

libc/test/integration/startup/linux/CMakeLists.txt

@@ -38,7 +38,6 @@ add_integration_test(
   SRCS
     tls_test.cpp
   DEPENDS
-    libc.include.errno
     libc.include.sys_mman
     libc.src.errno.errno
     libc.src.sys.mman.mmap

libc/test/integration/startup/linux/tls_test.cpp

@@ -10,7 +10,6 @@
 #include "src/sys/mman/mmap.h"
 #include "test/IntegrationTest/test.h"
 
-#include <errno.h>
 #include <sys/mman.h>
 
 constexpr int threadLocalDataSize = 101;

libc/test/src/__support/File/CMakeLists.txt

@@ -14,9 +14,9 @@ add_libc_test(
   LINK_LIBRARIES
     LibcMemoryHelpers
   DEPENDS
-    libc.include.errno
     libc.include.stdio
     libc.include.stdlib
+    libc.src.errno.errno 
     libc.src.__support.CPP.new
     libc.src.__support.File.file
 )

libc/test/src/math/RoundToIntegerTest.h

@@ -19,7 +19,6 @@
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
 #include "hdr/math_macros.h"
-#include <errno.h>
 
 namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
 using LIBC_NAMESPACE::Sign;

libc/test/src/math/acosf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 namespace mpfr = LIBC_NAMESPACE::testing::mpfr;

libc/test/src/math/acoshf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAcoshfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/asinf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAsinfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/asinhf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAsinhfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/atanf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAtanfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/atanhf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAtanhfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/cosf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/src/math/sdcomp26094.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LIBC_NAMESPACE::testing::SDCOMP26094_VALUES;

libc/test/src/math/coshf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcCoshfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/erff_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcErffTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/exp10_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcExp10Test = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/exp2_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcExp2Test = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/exp_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcExpTest = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/log10_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLog10Test = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/log10f_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLog10fTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/log1p_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLog1pTest = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/log1pf_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLog1pfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/log2_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLog2Test = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/log_test.cpp

@@ -14,7 +14,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcLogTest = LIBC_NAMESPACE::testing::FPTest<double>;

libc/test/src/math/powf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcPowfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/sincosf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/src/math/sdcomp26094.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcSinCosfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/sinf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/src/math/sdcomp26094.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcSinfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/sinhf_test.cpp

@@ -15,7 +15,6 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcSinhfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/RoundToIntegerTest.h

@@ -17,7 +17,6 @@
 #include "test/UnitTest/Test.h"
 
 #include "hdr/math_macros.h"
-#include <errno.h>
 
 static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
                                           FE_TONEAREST};

libc/test/src/math/smoke/acosf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAcosfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/acoshf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAcoshfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/asinf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAsinfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/asinhf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAsinhfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/atanf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LlvmLibcAtanfTest = LIBC_NAMESPACE::testing::FPTest<float>;

libc/test/src/math/smoke/atanhf_test.cpp

@@ -13,7 +13,6 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <errno.h>
 #include <stdint.h>
 
 using LIBC_NAMESPACE::Sign;