[libc-commits] [libc] [libc] Fix overlay mode inclusion for fcntl.h header. (PR #119159)

[via libc-commits]

https://github.com/lntue created https://github.com/llvm/llvm-project/pull/119159

None

>From daa9032e1187a399a4de273b7509952029b298d0 Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue at google.com>
Date: Sun, 8 Dec 2024 21:39:21 -0500
Subject: [PATCH] [libc] Fix overlay mode inclusion for fcntl.h header.

---
 libc/hdr/fcntl_overlay.h           | 10 ++++++++++
 libc/hdr/types/CMakeLists.txt      |  6 ++++++
 libc/hdr/types/struct_f_owner_ex.h |  2 +-
 libc/hdr/types/struct_flock.h      |  2 +-
 libc/hdr/types/struct_flock64.h    |  2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/libc/hdr/fcntl_overlay.h b/libc/hdr/fcntl_overlay.h
index c1cc98b0ebb2c7..17ae78b3d0eca0 100644
--- a/libc/hdr/fcntl_overlay.h
+++ b/libc/hdr/fcntl_overlay.h
@@ -20,6 +20,11 @@
 // `__USE_FORTIFY_LEVEL`, which will be temporarily disabled
 // with `_FORTIFY_SOURCE`.
 
+#ifdef _FORTIFY_SOURCE
+#define LIBC_OLD_FORTIFY_SOURCE _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#endif
+
 #ifdef __USE_FORTIFY_LEVEL
 #define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
 #undef __USE_FORTIFY_LEVEL
@@ -28,6 +33,11 @@
 
 #include <fcntl.h>
 
+#ifdef LIBC_OLD_FORTIFY_SOURCE
+#define _FORTIFY_SOURCE LIBC_OLD_FORTIFY_SOURCE
+#undef LIBC_OLD_FORTIFY_SOURCE
+#endif
+
 #ifdef LIBC_OLD_USE_FORTIFY_LEVEL
 #undef __USE_FORTIFY_LEVEL
 #define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL
diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt
index c4d14e6f893130..68a0e9603f9752 100644
--- a/libc/hdr/types/CMakeLists.txt
+++ b/libc/hdr/types/CMakeLists.txt
@@ -51,6 +51,8 @@ add_proxy_header_library(
   struct_flock
   HDRS
     struct_flock.h
+  DEPENDS
+    libc.hdr.fcntl_overlay
   FULL_BUILD_DEPENDS
     libc.include.llvm-libc-types.struct_flock
 )
@@ -59,6 +61,8 @@ add_proxy_header_library(
   struct_flock64
   HDRS
     struct_flock64.h
+  DEPENDS
+    libc.hdr.fcntl_overlay
   FULL_BUILD_DEPENDS
     libc.include.llvm-libc-types.struct_flock64
 )
@@ -67,6 +71,8 @@ add_proxy_header_library(
   struct_f_owner_ex
   HDRS
     struct_f_owner_ex.h
+  DEPENDS
+    libc.hdr.fcntl_overlay
   FULL_BUILD_DEPENDS
     libc.include.llvm-libc-types.struct_f_owner_ex
 )
diff --git a/libc/hdr/types/struct_f_owner_ex.h b/libc/hdr/types/struct_f_owner_ex.h
index 49985115ae4bb2..6e37cea6df84dd 100644
--- a/libc/hdr/types/struct_f_owner_ex.h
+++ b/libc/hdr/types/struct_f_owner_ex.h
@@ -14,7 +14,7 @@
 
 #else
 
-#include <fcntl.h>
+#include "hdr/fcntl_overlay.h"
 
 #endif // LIBC_FULL_BUILD
 
diff --git a/libc/hdr/types/struct_flock.h b/libc/hdr/types/struct_flock.h
index a552b91c432b38..6a6c928e6fa6dc 100644
--- a/libc/hdr/types/struct_flock.h
+++ b/libc/hdr/types/struct_flock.h
@@ -14,7 +14,7 @@
 
 #else
 
-#include <fcntl.h>
+#include "hdr/fcntl_overlay.h"
 
 #endif // LIBC_FULL_BUILD
 
diff --git a/libc/hdr/types/struct_flock64.h b/libc/hdr/types/struct_flock64.h
index 84fe67816c3372..fcfda59479a297 100644
--- a/libc/hdr/types/struct_flock64.h
+++ b/libc/hdr/types/struct_flock64.h
@@ -14,7 +14,7 @@
 
 #else
 
-#include <fcntl.h>
+#include "hdr/fcntl_overlay.h"
 
 #endif // LIBC_FULL_BUILD