[libc-commits] [libc] [libc] remove #include <fcntl.h> and add proxy or type (PR #113836)
Job Henandez Lara via libc-commits
libc-commits at lists.llvm.org
Sun Oct 27 15:19:38 PDT 2024
https://github.com/Jobhdez updated https://github.com/llvm/llvm-project/pull/113836
>From 4b0edeae5f322fd976a7ed905a26aafe76ff1a40 Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sun, 27 Oct 2024 13:48:50 -0700
Subject: [PATCH 1/4] remove fcntl header and add proxy or type
---
libc/src/__support/File/linux/CMakeLists.txt | 4 ++--
libc/src/__support/File/linux/dir.cpp | 2 +-
libc/src/__support/File/linux/file.cpp | 2 +-
.../__support/threads/linux/CMakeLists.txt | 2 +-
libc/src/__support/threads/linux/thread.cpp | 2 +-
libc/src/fcntl/creat.h | 2 +-
libc/src/fcntl/linux/creat.cpp | 2 +-
libc/src/fcntl/linux/open.cpp | 2 +-
libc/src/fcntl/linux/openat.cpp | 2 +-
libc/src/fcntl/open.h | 2 +-
libc/src/fcntl/openat.h | 2 +-
libc/src/spawn/linux/CMakeLists.txt | 2 +-
libc/src/spawn/linux/posix_spawn.cpp | 2 +-
libc/src/stdio/linux/CMakeLists.txt | 2 +-
libc/src/stdio/linux/remove.cpp | 2 +-
libc/src/sys/stat/linux/CMakeLists.txt | 11 +++++-----
libc/src/sys/stat/linux/chmod.cpp | 2 +-
libc/src/sys/stat/linux/fchmod.cpp | 2 +-
libc/src/sys/stat/linux/fstat.cpp | 2 +-
libc/src/sys/stat/linux/lstat.cpp | 2 +-
libc/src/sys/stat/linux/mkdir.cpp | 2 +-
libc/src/sys/stat/linux/stat.cpp | 2 +-
libc/src/unistd/linux/CMakeLists.txt | 21 ++++++++++---------
libc/src/unistd/linux/access.cpp | 2 +-
libc/src/unistd/linux/dup2.cpp | 2 +-
libc/src/unistd/linux/link.cpp | 2 +-
libc/src/unistd/linux/linkat.cpp | 2 +-
libc/src/unistd/linux/readlink.cpp | 2 +-
libc/src/unistd/linux/readlinkat.cpp | 2 +-
libc/src/unistd/linux/rmdir.cpp | 2 +-
libc/src/unistd/linux/symlink.cpp | 2 +-
libc/src/unistd/linux/symlinkat.cpp | 2 +-
libc/src/unistd/linux/unlink.cpp | 2 +-
libc/src/unistd/linux/unlinkat.cpp | 2 +-
libc/test/src/fcntl/CMakeLists.txt | 2 +-
libc/test/src/fcntl/openat_test.cpp | 2 +-
libc/test/src/sys/sendfile/CMakeLists.txt | 2 +-
libc/test/src/sys/sendfile/sendfile_test.cpp | 2 +-
libc/test/src/sys/stat/CMakeLists.txt | 14 ++++++-------
libc/test/src/sys/stat/chmod_test.cpp | 2 +-
libc/test/src/sys/stat/fchmod_test.cpp | 2 +-
libc/test/src/sys/stat/fchmodat_test.cpp | 2 +-
libc/test/src/sys/stat/fstat_test.cpp | 2 +-
libc/test/src/sys/stat/lstat_test.cpp | 2 +-
libc/test/src/sys/stat/mkdirat_test.cpp | 2 +-
libc/test/src/sys/stat/stat_test.cpp | 2 +-
libc/test/src/unistd/CMakeLists.txt | 9 ++++----
libc/test/src/unistd/chdir_test.cpp | 2 +-
libc/test/src/unistd/fchdir_test.cpp | 2 +-
libc/test/src/unistd/readlinkat_test.cpp | 2 +-
libc/test/src/unistd/rmdir_test.cpp | 2 +-
libc/test/src/unistd/syscall_test.cpp | 2 +-
52 files changed, 78 insertions(+), 75 deletions(-)
diff --git a/libc/src/__support/File/linux/CMakeLists.txt b/libc/src/__support/File/linux/CMakeLists.txt
index 5abbf11b3671cd..84e3d5608361e1 100644
--- a/libc/src/__support/File/linux/CMakeLists.txt
+++ b/libc/src/__support/File/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ add_object_library(
file.h
lseekImpl.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_syscall
libc.include.sys_stat
libc.src.__support.CPP.new
@@ -55,7 +55,7 @@ add_object_library(
SRCS
dir.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
libc.src.__support.error_or
diff --git a/libc/src/__support/File/linux/dir.cpp b/libc/src/__support/File/linux/dir.cpp
index fc90ff097e4606..985e72ec69e418 100644
--- a/libc/src/__support/File/linux/dir.cpp
+++ b/libc/src/__support/File/linux/dir.cpp
@@ -12,7 +12,7 @@
#include "src/__support/error_or.h"
#include "src/__support/macros/config.h"
-#include <fcntl.h> // For open flags
+#include "hdr/fcntl_macros.h" // For open flags
#include <sys/syscall.h> // For syscall numbers
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/__support/File/linux/file.cpp b/libc/src/__support/File/linux/file.cpp
index 22292336f300e2..85124e68fe5ffb 100644
--- a/libc/src/__support/File/linux/file.cpp
+++ b/libc/src/__support/File/linux/file.cpp
@@ -18,7 +18,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
-#include <fcntl.h> // For mode_t and other flags to the open syscall
+#include "hdr/fcntl_macros.h" // For mode_t and other flags to the open syscall
#include <sys/stat.h> // For S_IS*, S_IF*, and S_IR* flags.
#include <sys/syscall.h> // For syscall numbers
diff --git a/libc/src/__support/threads/linux/CMakeLists.txt b/libc/src/__support/threads/linux/CMakeLists.txt
index b6796f40adce7b..fa11458f99b6c9 100644
--- a/libc/src/__support/threads/linux/CMakeLists.txt
+++ b/libc/src/__support/threads/linux/CMakeLists.txt
@@ -79,7 +79,7 @@ add_object_library(
.futex_utils
libc.config.app_h
libc.include.sys_syscall
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.src.errno.errno
libc.src.__support.CPP.atomic
libc.src.__support.CPP.stringstream
diff --git a/libc/src/__support/threads/linux/thread.cpp b/libc/src/__support/threads/linux/thread.cpp
index ee3f63fa3cde32..c531d74c533550 100644
--- a/libc/src/__support/threads/linux/thread.cpp
+++ b/libc/src/__support/threads/linux/thread.cpp
@@ -22,7 +22,7 @@
#include <arm_acle.h>
#endif
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <linux/param.h> // For EXEC_PAGESIZE.
#include <linux/prctl.h> // For PR_SET_NAME
#include <linux/sched.h> // For CLONE_* flags.
diff --git a/libc/src/fcntl/creat.h b/libc/src/fcntl/creat.h
index e180e17c257887..809e4b488f6323 100644
--- a/libc/src/fcntl/creat.h
+++ b/libc/src/fcntl/creat.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_FCNTL_CREAT_H
#include "src/__support/macros/config.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/fcntl/linux/creat.cpp b/libc/src/fcntl/linux/creat.cpp
index 2c5b5d736a3be3..23abae243aed92 100644
--- a/libc/src/fcntl/linux/creat.cpp
+++ b/libc/src/fcntl/linux/creat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/fcntl/linux/open.cpp b/libc/src/fcntl/linux/open.cpp
index 79b7b2b32c887b..8904ea0ded44de 100644
--- a/libc/src/fcntl/linux/open.cpp
+++ b/libc/src/fcntl/linux/open.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/fcntl/linux/openat.cpp b/libc/src/fcntl/linux/openat.cpp
index 0862082c22ebfc..3cb03b09f92c20 100644
--- a/libc/src/fcntl/linux/openat.cpp
+++ b/libc/src/fcntl/linux/openat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/fcntl/open.h b/libc/src/fcntl/open.h
index 19bb53c2e32031..c38d9512c6aea2 100644
--- a/libc/src/fcntl/open.h
+++ b/libc/src/fcntl/open.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_FCNTL_OPEN_H
#include "src/__support/macros/config.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/fcntl/openat.h b/libc/src/fcntl/openat.h
index d09791a84f7352..0036c4f7bd3520 100644
--- a/libc/src/fcntl/openat.h
+++ b/libc/src/fcntl/openat.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_FCNTL_OPENAT_H
#include "src/__support/macros/config.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/spawn/linux/CMakeLists.txt b/libc/src/spawn/linux/CMakeLists.txt
index 9ef3a9d18b0c69..d7062968426638 100644
--- a/libc/src/spawn/linux/CMakeLists.txt
+++ b/libc/src/spawn/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../posix_spawn.h
DEPENDS
- libc.include.fcntl
+ libc.include.llvm-libc-types.mode_t
libc.include.spawn
libc.include.sys_syscall
libc.include.signal
diff --git a/libc/src/spawn/linux/posix_spawn.cpp b/libc/src/spawn/linux/posix_spawn.cpp
index 4c0469b3ce384a..93ea865e1ea87c 100644
--- a/libc/src/spawn/linux/posix_spawn.cpp
+++ b/libc/src/spawn/linux/posix_spawn.cpp
@@ -14,7 +14,7 @@
#include "src/__support/macros/config.h"
#include "src/spawn/file_actions.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <signal.h> // For SIGCHLD
#include <spawn.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/stdio/linux/CMakeLists.txt b/libc/src/stdio/linux/CMakeLists.txt
index d6241e1ca0439d..e81642dc6f01e6 100644
--- a/libc/src/stdio/linux/CMakeLists.txt
+++ b/libc/src/stdio/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../remove.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
diff --git a/libc/src/stdio/linux/remove.cpp b/libc/src/stdio/linux/remove.cpp
index 9e299aaf43e450..86b784ea06d4f8 100644
--- a/libc/src/stdio/linux/remove.cpp
+++ b/libc/src/stdio/linux/remove.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h> // For AT_* macros.
+#include "hdr/fcntl_macros.h" // For AT_* macros.
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sys/stat/linux/CMakeLists.txt b/libc/src/sys/stat/linux/CMakeLists.txt
index 415d2fa5c87715..e015e2f3ddf07c 100644
--- a/libc/src/sys/stat/linux/CMakeLists.txt
+++ b/libc/src/sys/stat/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../chmod.h
DEPENDS
- libc.include.fcntl
+ libc.include.llvm-libc-types.mode_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -19,6 +19,7 @@ add_entrypoint_object(
HDRS
../fchmod.h
DEPENDS
+ libc.include.llvm-libc-types.mode_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -45,7 +46,7 @@ add_entrypoint_object(
HDRS
../mkdir.h
DEPENDS
- libc.include.fcntl
+ libc.include.llvm-libc-types.mode_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -84,7 +85,7 @@ add_entrypoint_object(
../stat.h
DEPENDS
.kernel_statx
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
)
@@ -97,7 +98,7 @@ add_entrypoint_object(
../lstat.h
DEPENDS
.kernel_statx
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
)
@@ -110,7 +111,7 @@ add_entrypoint_object(
../fstat.h
DEPENDS
.kernel_statx
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
)
diff --git a/libc/src/sys/stat/linux/chmod.cpp b/libc/src/sys/stat/linux/chmod.cpp
index c91cabb514a8c9..baaca5e14f26c7 100644
--- a/libc/src/sys/stat/linux/chmod.cpp
+++ b/libc/src/sys/stat/linux/chmod.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/fchmod.cpp b/libc/src/sys/stat/linux/fchmod.cpp
index 7b6c7b7091a823..bf0f3fa4a8a856 100644
--- a/libc/src/sys/stat/linux/fchmod.cpp
+++ b/libc/src/sys/stat/linux/fchmod.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/fstat.cpp b/libc/src/sys/stat/linux/fstat.cpp
index 411aa47bcda2ad..35cf8f08f782d2 100644
--- a/libc/src/sys/stat/linux/fstat.cpp
+++ b/libc/src/sys/stat/linux/fstat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/common.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sys/stat/linux/lstat.cpp b/libc/src/sys/stat/linux/lstat.cpp
index 5a6eff068d1dd7..354c5b6e029a44 100644
--- a/libc/src/sys/stat/linux/lstat.cpp
+++ b/libc/src/sys/stat/linux/lstat.cpp
@@ -14,7 +14,7 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sys/stat/linux/mkdir.cpp b/libc/src/sys/stat/linux/mkdir.cpp
index 527c3d2058d2b7..5b494eb51324e1 100644
--- a/libc/src/sys/stat/linux/mkdir.cpp
+++ b/libc/src/sys/stat/linux/mkdir.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/stat.cpp b/libc/src/sys/stat/linux/stat.cpp
index c5149e6e3c8839..de9cdb197d687c 100644
--- a/libc/src/sys/stat/linux/stat.cpp
+++ b/libc/src/sys/stat/linux/stat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/common.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
index 9b0d752cefbd8e..472438ca72e49e 100644
--- a/libc/src/unistd/linux/CMakeLists.txt
+++ b/libc/src/unistd/linux/CMakeLists.txt
@@ -5,6 +5,7 @@ add_entrypoint_object(
HDRS
../access.h
DEPENDS
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -57,7 +58,7 @@ add_entrypoint_object(
HDRS
../dup2.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -254,7 +255,7 @@ add_entrypoint_object(
HDRS
../link.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -268,7 +269,7 @@ add_entrypoint_object(
HDRS
../linkat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -377,7 +378,7 @@ add_entrypoint_object(
HDRS
../rmdir.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -391,7 +392,7 @@ add_entrypoint_object(
HDRS
../readlink.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -405,7 +406,7 @@ add_entrypoint_object(
HDRS
../readlinkat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -419,7 +420,7 @@ add_entrypoint_object(
HDRS
../symlink.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -433,7 +434,7 @@ add_entrypoint_object(
HDRS
../symlinkat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -485,7 +486,7 @@ add_entrypoint_object(
HDRS
../unlink.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -499,7 +500,7 @@ add_entrypoint_object(
HDRS
../unlinkat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
diff --git a/libc/src/unistd/linux/access.cpp b/libc/src/unistd/linux/access.cpp
index e9ad74989b0563..e0e12aa06c2694 100644
--- a/libc/src/unistd/linux/access.cpp
+++ b/libc/src/unistd/linux/access.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/dup2.cpp b/libc/src/unistd/linux/dup2.cpp
index 51a19a71a7d854..49a8f6d2c8bfb2 100644
--- a/libc/src/unistd/linux/dup2.cpp
+++ b/libc/src/unistd/linux/dup2.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/link.cpp b/libc/src/unistd/linux/link.cpp
index 37ca58eab1096d..477806a70df742 100644
--- a/libc/src/unistd/linux/link.cpp
+++ b/libc/src/unistd/linux/link.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/linkat.cpp b/libc/src/unistd/linux/linkat.cpp
index fcd6a5f75a196b..d7d91cba7e1851 100644
--- a/libc/src/unistd/linux/linkat.cpp
+++ b/libc/src/unistd/linux/linkat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/readlink.cpp b/libc/src/unistd/linux/readlink.cpp
index 7b152450044054..eb69b6ea1d074d 100644
--- a/libc/src/unistd/linux/readlink.cpp
+++ b/libc/src/unistd/linux/readlink.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/readlinkat.cpp b/libc/src/unistd/linux/readlinkat.cpp
index 19a9ff9fbeb72a..5b58d44dab6b78 100644
--- a/libc/src/unistd/linux/readlinkat.cpp
+++ b/libc/src/unistd/linux/readlinkat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/rmdir.cpp b/libc/src/unistd/linux/rmdir.cpp
index 8974468ebcf16a..075af12af64c5c 100644
--- a/libc/src/unistd/linux/rmdir.cpp
+++ b/libc/src/unistd/linux/rmdir.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/symlink.cpp b/libc/src/unistd/linux/symlink.cpp
index 5efd4df85edabd..9e1b2886ea0f5f 100644
--- a/libc/src/unistd/linux/symlink.cpp
+++ b/libc/src/unistd/linux/symlink.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/symlinkat.cpp b/libc/src/unistd/linux/symlinkat.cpp
index 63d2e6d1507a57..f18618d2290f47 100644
--- a/libc/src/unistd/linux/symlinkat.cpp
+++ b/libc/src/unistd/linux/symlinkat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/unlink.cpp b/libc/src/unistd/linux/unlink.cpp
index de7cae8b826ebc..f5db605800bfbf 100644
--- a/libc/src/unistd/linux/unlink.cpp
+++ b/libc/src/unistd/linux/unlink.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/unlinkat.cpp b/libc/src/unistd/linux/unlinkat.cpp
index e794f242b9459a..4ed20f542f1702 100644
--- a/libc/src/unistd/linux/unlinkat.cpp
+++ b/libc/src/unistd/linux/unlinkat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/test/src/fcntl/CMakeLists.txt b/libc/test/src/fcntl/CMakeLists.txt
index 48048b7fe88666..b522fef7439df7 100644
--- a/libc/test/src/fcntl/CMakeLists.txt
+++ b/libc/test/src/fcntl/CMakeLists.txt
@@ -42,7 +42,7 @@ add_libc_unittest(
SRCS
openat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.src.errno.errno
libc.src.fcntl.open
libc.src.fcntl.openat
diff --git a/libc/test/src/fcntl/openat_test.cpp b/libc/test/src/fcntl/openat_test.cpp
index 9dafd125224a40..547359eb9f7a9d 100644
--- a/libc/test/src/fcntl/openat_test.cpp
+++ b/libc/test/src/fcntl/openat_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
TEST(LlvmLibcUniStd, OpenAndReadTest) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
diff --git a/libc/test/src/sys/sendfile/CMakeLists.txt b/libc/test/src/sys/sendfile/CMakeLists.txt
index 82efaa147bd89d..ceaa4accdd06ef 100644
--- a/libc/test/src/sys/sendfile/CMakeLists.txt
+++ b/libc/test/src/sys/sendfile/CMakeLists.txt
@@ -9,7 +9,7 @@ add_libc_unittest(
SRCS
sendfile_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.fcntl.open
diff --git a/libc/test/src/sys/sendfile/sendfile_test.cpp b/libc/test/src/sys/sendfile/sendfile_test.cpp
index 59025438a24671..a658212ddb72cd 100644
--- a/libc/test/src/sys/sendfile/sendfile_test.cpp
+++ b/libc/test/src/sys/sendfile/sendfile_test.cpp
@@ -17,7 +17,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
namespace cpp = LIBC_NAMESPACE::cpp;
diff --git a/libc/test/src/sys/stat/CMakeLists.txt b/libc/test/src/sys/stat/CMakeLists.txt
index 877a129b627dd4..dd3d0932755b76 100644
--- a/libc/test/src/sys/stat/CMakeLists.txt
+++ b/libc/test/src/sys/stat/CMakeLists.txt
@@ -9,7 +9,7 @@ add_libc_unittest(
SRCS
chmod_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.fcntl.open
@@ -25,7 +25,7 @@ add_libc_unittest(
SRCS
fchmodat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.fcntl.open
@@ -41,7 +41,7 @@ add_libc_unittest(
SRCS
fchmod_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.fcntl.open
@@ -57,7 +57,7 @@ add_libc_unittest(
SRCS
mkdirat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.sys.stat.mkdirat
@@ -71,7 +71,7 @@ add_libc_unittest(
SRCS
stat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.sys.stat.stat
@@ -87,7 +87,7 @@ add_libc_unittest(
SRCS
lstat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.sys.stat.lstat
@@ -103,7 +103,7 @@ add_libc_unittest(
SRCS
fstat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_stat
libc.src.errno.errno
libc.src.sys.stat.fstat
diff --git a/libc/test/src/sys/stat/chmod_test.cpp b/libc/test/src/sys/stat/chmod_test.cpp
index c688996615ceef..83ab0f45b6f08a 100644
--- a/libc/test/src/sys/stat/chmod_test.cpp
+++ b/libc/test/src/sys/stat/chmod_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcChmodTest, ChangeAndOpen) {
diff --git a/libc/test/src/sys/stat/fchmod_test.cpp b/libc/test/src/sys/stat/fchmod_test.cpp
index 91c0f68b8708c8..03eb79d95ddd6d 100644
--- a/libc/test/src/sys/stat/fchmod_test.cpp
+++ b/libc/test/src/sys/stat/fchmod_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcChmodTest, ChangeAndOpen) {
diff --git a/libc/test/src/sys/stat/fchmodat_test.cpp b/libc/test/src/sys/stat/fchmodat_test.cpp
index c43ef8ae13315a..09970b6e0fb163 100644
--- a/libc/test/src/sys/stat/fchmodat_test.cpp
+++ b/libc/test/src/sys/stat/fchmodat_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcFchmodatTest, ChangeAndOpen) {
diff --git a/libc/test/src/sys/stat/fstat_test.cpp b/libc/test/src/sys/stat/fstat_test.cpp
index 1379eae26a47ae..34c675d1a4e299 100644
--- a/libc/test/src/sys/stat/fstat_test.cpp
+++ b/libc/test/src/sys/stat/fstat_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcFStatTest, CreatAndReadMode) {
diff --git a/libc/test/src/sys/stat/lstat_test.cpp b/libc/test/src/sys/stat/lstat_test.cpp
index b44b3d1a59ce7b..a723d5ae2e297b 100644
--- a/libc/test/src/sys/stat/lstat_test.cpp
+++ b/libc/test/src/sys/stat/lstat_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcLStatTest, CreatAndReadMode) {
diff --git a/libc/test/src/sys/stat/mkdirat_test.cpp b/libc/test/src/sys/stat/mkdirat_test.cpp
index cbacc16b402d7a..85e013de234e76 100644
--- a/libc/test/src/sys/stat/mkdirat_test.cpp
+++ b/libc/test/src/sys/stat/mkdirat_test.cpp
@@ -11,7 +11,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
TEST(LlvmLibcMkdiratTest, CreateAndRemove) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
diff --git a/libc/test/src/sys/stat/stat_test.cpp b/libc/test/src/sys/stat/stat_test.cpp
index baf363382022ad..0ddd8baaec1c9b 100644
--- a/libc/test/src/sys/stat/stat_test.cpp
+++ b/libc/test/src/sys/stat/stat_test.cpp
@@ -14,7 +14,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h>
TEST(LlvmLibcStatTest, CreatAndReadMode) {
diff --git a/libc/test/src/unistd/CMakeLists.txt b/libc/test/src/unistd/CMakeLists.txt
index e03e56b3cf8ad7..ce936cebad4260 100644
--- a/libc/test/src/unistd/CMakeLists.txt
+++ b/libc/test/src/unistd/CMakeLists.txt
@@ -24,11 +24,12 @@ add_libc_unittest(
SRCS
chdir_test.cpp
DEPENDS
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.src.errno.errno
- libc.src.fcntl.open
libc.src.unistd.chdir
libc.src.unistd.close
+ libc.src.fcntl.open
libc.test.UnitTest.ErrnoSetterMatcher
)
@@ -223,7 +224,7 @@ add_libc_unittest(
SRCS
rmdir_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.src.errno.errno
libc.src.sys.stat.mkdir
libc.src.unistd.rmdir
@@ -262,7 +263,7 @@ add_libc_unittest(
SRCS
readlinkat_test.cpp
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.unistd
libc.src.errno.errno
libc.src.unistd.readlinkat
@@ -410,7 +411,7 @@ add_libc_unittest(
syscall_test.cpp
DEPENDS
libc.include.unistd
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.include.sys_syscall
libc.src.errno.errno
libc.src.unistd.__llvm_libc_syscall
diff --git a/libc/test/src/unistd/chdir_test.cpp b/libc/test/src/unistd/chdir_test.cpp
index 51dc7bb15d3ee6..e1bdcd77119f73 100644
--- a/libc/test/src/unistd/chdir_test.cpp
+++ b/libc/test/src/unistd/chdir_test.cpp
@@ -13,7 +13,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
TEST(LlvmLibcChdirTest, ChangeAndOpen) {
// The idea of this test is that we will first open an existing test file
diff --git a/libc/test/src/unistd/fchdir_test.cpp b/libc/test/src/unistd/fchdir_test.cpp
index ae88e1f22ed6b7..0e39fde17c67bb 100644
--- a/libc/test/src/unistd/fchdir_test.cpp
+++ b/libc/test/src/unistd/fchdir_test.cpp
@@ -13,7 +13,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
TEST(LlvmLibcChdirTest, ChangeAndOpen) {
// The idea of this test is that we will first open an existing test file
diff --git a/libc/test/src/unistd/readlinkat_test.cpp b/libc/test/src/unistd/readlinkat_test.cpp
index 1fa683b02b5b5e..9e4bb9af02e76a 100644
--- a/libc/test/src/unistd/readlinkat_test.cpp
+++ b/libc/test/src/unistd/readlinkat_test.cpp
@@ -15,7 +15,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
namespace cpp = LIBC_NAMESPACE::cpp;
diff --git a/libc/test/src/unistd/rmdir_test.cpp b/libc/test/src/unistd/rmdir_test.cpp
index 93cb0f3f53c1b0..4f4cd94c5cf0b7 100644
--- a/libc/test/src/unistd/rmdir_test.cpp
+++ b/libc/test/src/unistd/rmdir_test.cpp
@@ -12,7 +12,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
TEST(LlvmLibcRmdirTest, CreateAndRemove) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
diff --git a/libc/test/src/unistd/syscall_test.cpp b/libc/test/src/unistd/syscall_test.cpp
index cee29bd9afa308..f6cc3eab9aabe8 100644
--- a/libc/test/src/unistd/syscall_test.cpp
+++ b/libc/test/src/unistd/syscall_test.cpp
@@ -11,7 +11,7 @@
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h>
+#include "hdr/fcntl_macros.h"
#include <sys/stat.h> // For S_* flags.
#include <sys/syscall.h> // For syscall numbers.
#include <unistd.h>
>From df4330c06a160e4ee057e5fde27fd3ccc1de502d Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sun, 27 Oct 2024 13:51:12 -0700
Subject: [PATCH 2/4] format code
---
libc/src/__support/File/linux/dir.cpp | 2 +-
libc/src/__support/File/linux/file.cpp | 2 +-
libc/src/fcntl/creat.h | 2 +-
libc/src/fcntl/open.h | 2 +-
libc/src/fcntl/openat.h | 2 +-
libc/src/stdio/linux/remove.cpp | 2 +-
libc/src/sys/stat/linux/chmod.cpp | 2 +-
libc/src/sys/stat/linux/fchmod.cpp | 2 +-
libc/src/sys/stat/linux/mkdir.cpp | 2 +-
libc/src/unistd/linux/access.cpp | 2 +-
libc/src/unistd/linux/dup2.cpp | 2 +-
libc/src/unistd/linux/linkat.cpp | 2 +-
libc/src/unistd/linux/readlink.cpp | 2 +-
libc/src/unistd/linux/readlinkat.cpp | 2 +-
libc/src/unistd/linux/symlinkat.cpp | 2 +-
libc/src/unistd/linux/unlink.cpp | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libc/src/__support/File/linux/dir.cpp b/libc/src/__support/File/linux/dir.cpp
index 985e72ec69e418..5fe44fa8297b68 100644
--- a/libc/src/__support/File/linux/dir.cpp
+++ b/libc/src/__support/File/linux/dir.cpp
@@ -12,7 +12,7 @@
#include "src/__support/error_or.h"
#include "src/__support/macros/config.h"
-#include "hdr/fcntl_macros.h" // For open flags
+#include "hdr/fcntl_macros.h" // For open flags
#include <sys/syscall.h> // For syscall numbers
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/__support/File/linux/file.cpp b/libc/src/__support/File/linux/file.cpp
index 85124e68fe5ffb..824c1f200e8c5b 100644
--- a/libc/src/__support/File/linux/file.cpp
+++ b/libc/src/__support/File/linux/file.cpp
@@ -18,7 +18,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
-#include "hdr/fcntl_macros.h" // For mode_t and other flags to the open syscall
+#include "hdr/fcntl_macros.h" // For mode_t and other flags to the open syscall
#include <sys/stat.h> // For S_IS*, S_IF*, and S_IR* flags.
#include <sys/syscall.h> // For syscall numbers
diff --git a/libc/src/fcntl/creat.h b/libc/src/fcntl/creat.h
index 809e4b488f6323..3e00427638a36a 100644
--- a/libc/src/fcntl/creat.h
+++ b/libc/src/fcntl/creat.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_FCNTL_CREAT_H
#define LLVM_LIBC_SRC_FCNTL_CREAT_H
-#include "src/__support/macros/config.h"
#include "hdr/fcntl_macros.h"
+#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/fcntl/open.h b/libc/src/fcntl/open.h
index c38d9512c6aea2..11f0ae53795318 100644
--- a/libc/src/fcntl/open.h
+++ b/libc/src/fcntl/open.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_FCNTL_OPEN_H
#define LLVM_LIBC_SRC_FCNTL_OPEN_H
-#include "src/__support/macros/config.h"
#include "hdr/fcntl_macros.h"
+#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/fcntl/openat.h b/libc/src/fcntl/openat.h
index 0036c4f7bd3520..051c8a2304dcba 100644
--- a/libc/src/fcntl/openat.h
+++ b/libc/src/fcntl/openat.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_FCNTL_OPENAT_H
#define LLVM_LIBC_SRC_FCNTL_OPENAT_H
-#include "src/__support/macros/config.h"
#include "hdr/fcntl_macros.h"
+#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdio/linux/remove.cpp b/libc/src/stdio/linux/remove.cpp
index 86b784ea06d4f8..dbb4491d0e6cc1 100644
--- a/libc/src/stdio/linux/remove.cpp
+++ b/libc/src/stdio/linux/remove.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h" // For AT_* macros.
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h" // For AT_* macros.
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sys/stat/linux/chmod.cpp b/libc/src/sys/stat/linux/chmod.cpp
index baaca5e14f26c7..3ba6b536e19985 100644
--- a/libc/src/sys/stat/linux/chmod.cpp
+++ b/libc/src/sys/stat/linux/chmod.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "include/llvm-libc-types/mode_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/fchmod.cpp b/libc/src/sys/stat/linux/fchmod.cpp
index bf0f3fa4a8a856..6fbf2fd7fa7c04 100644
--- a/libc/src/sys/stat/linux/fchmod.cpp
+++ b/libc/src/sys/stat/linux/fchmod.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "include/llvm-libc-types/mode_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/mkdir.cpp b/libc/src/sys/stat/linux/mkdir.cpp
index 5b494eb51324e1..cce39b71106c39 100644
--- a/libc/src/sys/stat/linux/mkdir.cpp
+++ b/libc/src/sys/stat/linux/mkdir.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "include/llvm-libc-types/mode_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "include/llvm-libc-types/mode_t.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/unistd/linux/access.cpp b/libc/src/unistd/linux/access.cpp
index e0e12aa06c2694..2f7ebbcdf9e810 100644
--- a/libc/src/unistd/linux/access.cpp
+++ b/libc/src/unistd/linux/access.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/dup2.cpp b/libc/src/unistd/linux/dup2.cpp
index 49a8f6d2c8bfb2..c7c7c1a8ca786f 100644
--- a/libc/src/unistd/linux/dup2.cpp
+++ b/libc/src/unistd/linux/dup2.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/linkat.cpp b/libc/src/unistd/linux/linkat.cpp
index d7d91cba7e1851..40f68cc90c4809 100644
--- a/libc/src/unistd/linux/linkat.cpp
+++ b/libc/src/unistd/linux/linkat.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/readlink.cpp b/libc/src/unistd/linux/readlink.cpp
index eb69b6ea1d074d..2055e6b3400f2f 100644
--- a/libc/src/unistd/linux/readlink.cpp
+++ b/libc/src/unistd/linux/readlink.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/readlinkat.cpp b/libc/src/unistd/linux/readlinkat.cpp
index 5b58d44dab6b78..e5e4d0d39bc9cf 100644
--- a/libc/src/unistd/linux/readlinkat.cpp
+++ b/libc/src/unistd/linux/readlinkat.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/symlinkat.cpp b/libc/src/unistd/linux/symlinkat.cpp
index f18618d2290f47..bcf2d0f8cc0551 100644
--- a/libc/src/unistd/linux/symlinkat.cpp
+++ b/libc/src/unistd/linux/symlinkat.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/unlink.cpp b/libc/src/unistd/linux/unlink.cpp
index f5db605800bfbf..72d8e2398e3d76 100644
--- a/libc/src/unistd/linux/unlink.cpp
+++ b/libc/src/unistd/linux/unlink.cpp
@@ -11,9 +11,9 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "hdr/fcntl_macros.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
>From d76fe9d9b5bfcb1ca551c89ab9a9ab7a54836799 Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sun, 27 Oct 2024 15:18:47 -0700
Subject: [PATCH 3/4] address review
---
libc/hdr/CMakeLists.txt | 3 ++
libc/hdr/fcntl_macros.h | 2 +-
libc/hdr/fcntl_overlay.h | 40 ++++++++++++++++++++++++++
libc/hdr/types/CMakeLists.txt | 11 +++++++
libc/hdr/types/fcntl_t.h | 22 ++++++++++++++
libc/src/fcntl/linux/CMakeLists.txt | 8 +++---
libc/src/fcntl/linux/open.cpp | 2 +-
libc/src/fcntl/linux/openat.cpp | 2 +-
libc/src/spawn/linux/CMakeLists.txt | 2 +-
libc/src/spawn/linux/posix_spawn.cpp | 2 +-
libc/src/sys/stat/linux/CMakeLists.txt | 6 ++--
libc/src/sys/stat/linux/chmod.cpp | 2 +-
libc/src/sys/stat/linux/fchmod.cpp | 2 +-
libc/src/sys/stat/linux/mkdir.cpp | 2 +-
14 files changed, 91 insertions(+), 15 deletions(-)
create mode 100644 libc/hdr/fcntl_overlay.h
create mode 100644 libc/hdr/types/fcntl_t.h
diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt
index 13dc892978bb87..80545ee4b359f4 100644
--- a/libc/hdr/CMakeLists.txt
+++ b/libc/hdr/CMakeLists.txt
@@ -51,10 +51,13 @@ add_proxy_header_library(
libc.include.llvm-libc-macros.generic_error_number_macros
)
+add_header_library(fcntl_overlay HDRS fcntl_overlay.h)
add_proxy_header_library(
fcntl_macros
HDRS
fcntl_macros.h
+ DEPENDS
+ .fcntl_overlay
FULL_BUILD_DEPENDS
libc.include.llvm-libc-macros.fcntl_macros
libc.include.fcntl
diff --git a/libc/hdr/fcntl_macros.h b/libc/hdr/fcntl_macros.h
index 828cb984c0cb14..3a1ddeb0a2da1d 100644
--- a/libc/hdr/fcntl_macros.h
+++ b/libc/hdr/fcntl_macros.h
@@ -15,7 +15,7 @@
#else // Overlay mode
-#include <fcntl.h>
+#include "hdr/fcntl_overlay.h"
#endif // LLVM_LIBC_FULL_BUILD
diff --git a/libc/hdr/fcntl_overlay.h b/libc/hdr/fcntl_overlay.h
new file mode 100644
index 00000000000000..922ef029cc5674
--- /dev/null
+++ b/libc/hdr/fcntl_overlay.h
@@ -0,0 +1,40 @@
+//===-- Including fcntl.h in overlay mode ---------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_FCNTL_OVERLAY_H
+#define LLVM_LIBC_HDR_FCNTL_OVERLAY_H
+
+#ifdef LIBC_FULL_BUILD
+#error "This header should only be included in overlay mode"
+#endif
+
+// Overlay mode
+
+// glibc <stdio.h> header might provide extern inline definitions for few
+// functions, causing external alias errors. They are guarded by
+// `__USE_EXTERN_INLINES` macro. We temporarily disable `__USE_EXTERN_INLINES`
+// macro by defining `__NO_INLINE__` before including <stdio.h>.
+// And the same with `__USE_FORTIFY_LEVEL`, which will be temporarily disabled
+// with `_FORTIFY_SOURCE`.
+
+#ifdef __USE_FORTIFY_LEVEL
+#define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
+#undef __USE_FORTIFY_LEVEL
+#define __USE_FORTIFY_LEVEL 0
+#endif
+
+#include <fcntl.h>
+
+#ifdef LIBC_OLD_USE_FORTIFY_LEVEL
+#undef __USE_FORTIFY_LEVEL
+#define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL
+#undef LIBC_OLD_USE_FORTIFY_LEVEL
+#endif
+
+
+#endif // LLVM_LIBC_HDR_STDIO_OVERLAY_H
diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt
index fab5245816bbe1..804d2af428cfbd 100644
--- a/libc/hdr/types/CMakeLists.txt
+++ b/libc/hdr/types/CMakeLists.txt
@@ -46,6 +46,17 @@ add_proxy_header_library(
libc.include.llvm-libc-types.struct_timespec
)
+add_proxy_header_library(
+ fcntl_t
+ HDRS
+ fcntl_t.h
+ DEPENDS
+ ../fcntl_overlay
+ FULL_BUILD_DEPENDS
+ libc.include.llvm-libc-types.mode_t
+ libc.include.fcntl
+)
+
add_proxy_header_library(
fenv_t
HDRS
diff --git a/libc/hdr/types/fcntl_t.h b/libc/hdr/types/fcntl_t.h
new file mode 100644
index 00000000000000..0a47be47f6fad7
--- /dev/null
+++ b/libc/hdr/types/fcntl_t.h
@@ -0,0 +1,22 @@
+//===-- Definition of macros from fcntl_t.h -------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_FCNTL_T_H
+#define LLVM_LIBC_HDR_FCNTL_T_H
+
+#ifdef LIBC_FULL_BUILD
+
+#include "include/llvm-libc-types/mode_t.h"
+
+#else // Overlay mode
+
+#include "hdr/fcntl_overlay.h"
+
+#endif // LLVM_LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_FCNTL_T_H
diff --git a/libc/src/fcntl/linux/CMakeLists.txt b/libc/src/fcntl/linux/CMakeLists.txt
index ee8ae63b8cf062..327d20c8e7b677 100644
--- a/libc/src/fcntl/linux/CMakeLists.txt
+++ b/libc/src/fcntl/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../creat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -17,7 +17,7 @@ add_entrypoint_object(
HDRS
../fcntl.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.fcntl_macros
libc.src.__support.OSUtil.osutil
)
@@ -28,7 +28,7 @@ add_entrypoint_object(
HDRS
../open.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.types.fcntl_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -40,7 +40,7 @@ add_entrypoint_object(
HDRS
../openat.h
DEPENDS
- libc.include.fcntl
+ libc.hdr.types.fcntl_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
diff --git a/libc/src/fcntl/linux/open.cpp b/libc/src/fcntl/linux/open.cpp
index 8904ea0ded44de..ba2828ae5fed2d 100644
--- a/libc/src/fcntl/linux/open.cpp
+++ b/libc/src/fcntl/linux/open.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/fcntl/linux/openat.cpp b/libc/src/fcntl/linux/openat.cpp
index 3cb03b09f92c20..4bca5408b67f66 100644
--- a/libc/src/fcntl/linux/openat.cpp
+++ b/libc/src/fcntl/linux/openat.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/spawn/linux/CMakeLists.txt b/libc/src/spawn/linux/CMakeLists.txt
index d7062968426638..8eec85aef2c490 100644
--- a/libc/src/spawn/linux/CMakeLists.txt
+++ b/libc/src/spawn/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../posix_spawn.h
DEPENDS
- libc.include.llvm-libc-types.mode_t
+ libc.hdr.types.fcntl_t
libc.include.spawn
libc.include.sys_syscall
libc.include.signal
diff --git a/libc/src/spawn/linux/posix_spawn.cpp b/libc/src/spawn/linux/posix_spawn.cpp
index 93ea865e1ea87c..6e332c5cc19b5b 100644
--- a/libc/src/spawn/linux/posix_spawn.cpp
+++ b/libc/src/spawn/linux/posix_spawn.cpp
@@ -14,7 +14,7 @@
#include "src/__support/macros/config.h"
#include "src/spawn/file_actions.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include <signal.h> // For SIGCHLD
#include <spawn.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sys/stat/linux/CMakeLists.txt b/libc/src/sys/stat/linux/CMakeLists.txt
index e015e2f3ddf07c..41bb103cc6656c 100644
--- a/libc/src/sys/stat/linux/CMakeLists.txt
+++ b/libc/src/sys/stat/linux/CMakeLists.txt
@@ -5,7 +5,7 @@ add_entrypoint_object(
HDRS
../chmod.h
DEPENDS
- libc.include.llvm-libc-types.mode_t
+ libc.hdr.types.fcntl_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -19,7 +19,7 @@ add_entrypoint_object(
HDRS
../fchmod.h
DEPENDS
- libc.include.llvm-libc-types.mode_t
+ libc.hdr.types.fcntl_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
@@ -46,7 +46,7 @@ add_entrypoint_object(
HDRS
../mkdir.h
DEPENDS
- libc.include.llvm-libc-types.mode_t
+ libc.hdr.types.fcntl_t
libc.include.sys_stat
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
diff --git a/libc/src/sys/stat/linux/chmod.cpp b/libc/src/sys/stat/linux/chmod.cpp
index 3ba6b536e19985..4393c523b6db17 100644
--- a/libc/src/sys/stat/linux/chmod.cpp
+++ b/libc/src/sys/stat/linux/chmod.cpp
@@ -11,7 +11,7 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/stat.h>
diff --git a/libc/src/sys/stat/linux/fchmod.cpp b/libc/src/sys/stat/linux/fchmod.cpp
index 6fbf2fd7fa7c04..dd36c40ea866ca 100644
--- a/libc/src/sys/stat/linux/fchmod.cpp
+++ b/libc/src/sys/stat/linux/fchmod.cpp
@@ -11,7 +11,7 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/stat.h>
diff --git a/libc/src/sys/stat/linux/mkdir.cpp b/libc/src/sys/stat/linux/mkdir.cpp
index cce39b71106c39..68b97f96a74fe3 100644
--- a/libc/src/sys/stat/linux/mkdir.cpp
+++ b/libc/src/sys/stat/linux/mkdir.cpp
@@ -11,7 +11,7 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "include/llvm-libc-types/mode_t.h"
+#include "hdr/types/fcntl_t.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/stat.h>
>From 8419e8005718938a6fc5f08723aead9b55ea2370 Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sun, 27 Oct 2024 15:19:22 -0700
Subject: [PATCH 4/4] format code
---
libc/hdr/fcntl_overlay.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/libc/hdr/fcntl_overlay.h b/libc/hdr/fcntl_overlay.h
index 922ef029cc5674..780681b9d0512e 100644
--- a/libc/hdr/fcntl_overlay.h
+++ b/libc/hdr/fcntl_overlay.h
@@ -36,5 +36,4 @@
#undef LIBC_OLD_USE_FORTIFY_LEVEL
#endif
-
#endif // LLVM_LIBC_HDR_STDIO_OVERLAY_H
More information about the libc-commits
mailing list