[libc-commits] [libc] [libc] Add missing type headers for generated public headers (PR #213395)

[Chris Copeland via libc-commits]

https://github.com/chrisnc updated https://github.com/llvm/llvm-project/pull/213395

>From 57efb98ab551f7abf0b02338aaad215bb5d79a7c Mon Sep 17 00:00:00 2001
From: Chris Copeland <chris at chrisnc.net>
Date: Thu, 21 May 2026 21:53:01 -0700
Subject: [PATCH] [libc] Add missing type/macro headers for generated public
 headers

---
 libc/include/CMakeLists.txt                  | 16 ++++++++++++++++
 libc/include/llvm-libc-macros/CMakeLists.txt |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 196490dcfdcc1..6e6159326007f 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -294,6 +294,7 @@ add_header_macro(
     .llvm-libc-macros.annex_k_macros
     .llvm-libc-macros.null_macro
     .llvm-libc-types.errno_t
+    .llvm-libc-types.locale_t
     .llvm-libc-types.rsize_t
     .llvm-libc-types.size_t
 )
@@ -312,6 +313,7 @@ add_header_macro(
   strings.h
   DEPENDS
     .llvm_libc_common_h
+    .llvm-libc-types.locale_t
     .llvm-libc-types.size_t
 )
 
@@ -363,6 +365,8 @@ add_header_macro(
     .llvm-libc-types.clockid_t
     .llvm-libc-types.rsize_t
     .llvm-libc-types.tm_gmtoff_t
+    .llvm-libc-types.locale_t
+    .llvm-libc-types.size_t
 )
 
 add_header_macro(
@@ -472,6 +476,7 @@ add_header_macro(
     .llvm-libc-types.locale_t
     .llvm-libc-types.rsize_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.wchar_t
     .llvm_libc_common_h
 )
 
@@ -485,6 +490,7 @@ add_header_macro(
     .llvm-libc-macros.unistd_macros
     .llvm-libc-types.__exec_argv_t
     .llvm-libc-types.__exec_envp_t
+    .llvm-libc-types.gid_t
     .llvm-libc-types.off_t
     .llvm-libc-types.pid_t
     .llvm-libc-types.size_t
@@ -634,6 +640,7 @@ add_header_macro(
     .llvm-libc-types.struct_epoll_event
     .llvm-libc-types.struct_epoll_data
     .llvm-libc-types.sigset_t
+    .llvm-libc-types.struct_timespec
     .llvm-libc-macros.sys_epoll_macros
 )
 
@@ -668,6 +675,7 @@ add_header_macro(
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_mman_macros
+    .llvm-libc-types.mode_t
     .llvm-libc-types.off_t
     .llvm-libc-types.size_t
     .llvm-libc-types.ssize_t
@@ -809,6 +817,7 @@ add_header_macro(
     .llvm-libc-macros.sys_socket_macros
     .llvm-libc-types.sa_family_t
     .llvm-libc-types.socklen_t
+    .llvm-libc-types.ssize_t
     .llvm-libc-types.struct_cmsghdr
     .llvm-libc-types.struct_iovec
     .llvm-libc-types.struct_linger
@@ -816,6 +825,7 @@ add_header_macro(
     .llvm-libc-types.struct_msghdr
     .llvm-libc-types.struct_sockaddr
     .llvm-libc-types.struct_sockaddr_storage
+    .llvm-libc-types.struct_timespec
     .llvm-libc-types.struct_ucred
 )
 
@@ -883,10 +893,13 @@ add_header_macro(
     .llvm-libc-types.pid_t
     .llvm-libc-types.pthread_attr_t
     .llvm-libc-types.pthread_cond_t
+    .llvm-libc-types.pthread_condattr_t
     .llvm-libc-types.pthread_key_t
     .llvm-libc-types.pthread_mutex_t
     .llvm-libc-types.pthread_mutexattr_t
     .llvm-libc-types.pthread_once_t
+    .llvm-libc-types.pthread_rwlock_t
+    .llvm-libc-types.pthread_rwlockattr_t
     .llvm-libc-types.pthread_t
     .llvm-libc-types.size_t
     .llvm-libc-types.ssize_t
@@ -1042,6 +1055,7 @@ add_header_macro(
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.mbstate_t
+    .llvm-libc-types.size_t
     .llvm-libc-types.char8_t
     .llvm-libc-types.char16_t
     .llvm-libc-types.char32_t
@@ -1060,6 +1074,8 @@ add_header_macro(
     .llvm-libc-types.size_t
     .llvm-libc-types.wint_t
     .llvm-libc-types.wchar_t
+    .llvm-libc-types.FILE
+    .llvm-libc-types.struct_tm
 )
 
 add_header_macro(
diff --git a/libc/include/llvm-libc-macros/CMakeLists.txt b/libc/include/llvm-libc-macros/CMakeLists.txt
index 45a1dbc851d2c..0ac23eae063b1 100644
--- a/libc/include/llvm-libc-macros/CMakeLists.txt
+++ b/libc/include/llvm-libc-macros/CMakeLists.txt
@@ -241,6 +241,8 @@ add_macro_header(
   sys_epoll_macros
   HDR
     sys-epoll-macros.h
+  DEPENDS
+    .fcntl_macros
 )
 
 add_macro_header(