llvm · lntue · Jul 24, 2025 · Jul 23, 2025 · Jul 23, 2025
diff --git a/libc/benchmarks/gpu/BenchmarkLogger.cpp b/libc/benchmarks/gpu/BenchmarkLogger.cpp
@@ -1,4 +1,5 @@
 #include "benchmarks/gpu/BenchmarkLogger.h"
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/string.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/OSUtil/io.h"               // write_to_stderr
@@ -7,8 +8,6 @@
 #include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
 #include "src/__support/uint128.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace benchmarks {
 

diff --git a/libc/benchmarks/gpu/CMakeLists.txt b/libc/benchmarks/gpu/CMakeLists.txt
@@ -45,6 +45,7 @@ add_unittest_framework_library(
     LibcGpuBenchmark.h
     BenchmarkLogger.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.big_int
     libc.src.__support.c_string
     libc.src.__support.CPP.string

diff --git a/libc/benchmarks/gpu/LibcGpuBenchmark.h b/libc/benchmarks/gpu/LibcGpuBenchmark.h
@@ -3,6 +3,7 @@
 
 #include "benchmarks/gpu/BenchmarkLogger.h"
 #include "benchmarks/gpu/timing/timing.h"
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/array.h"
 #include "src/__support/CPP/functional.h"
 #include "src/__support/CPP/limits.h"
@@ -13,8 +14,6 @@
 #include "src/stdlib/rand.h"
 #include "src/time/clock.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 namespace benchmarks {

diff --git a/libc/benchmarks/gpu/src/math/CMakeLists.txt b/libc/benchmarks/gpu/src/math/CMakeLists.txt
@@ -31,6 +31,7 @@ add_benchmark(
   SRCS
     sin_benchmark.cpp
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.math.sin
     libc.src.math.sinf
     libc.src.stdlib.srand
@@ -51,6 +52,7 @@ add_benchmark(
   SRCS
     atan2_benchmark.cpp
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.math.atan2
     libc.src.stdlib.srand
     libc.src.stdlib.rand

diff --git a/libc/benchmarks/gpu/src/math/platform.h b/libc/benchmarks/gpu/src/math/platform.h
@@ -7,9 +7,10 @@
 //===----------------------------------------------------------------------===//
 #ifndef LLVM_LIBC_SRC_MATH_AMDGPU_PLATFORM_H
 #define LLVM_LIBC_SRC_MATH_AMDGPU_PLATFORM_H
+
+#include "hdr/stdint_proxy.h"
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
-#include <stdint.h>
 
 namespace LIBC_NAMESPACE_DECL {
 

diff --git a/libc/benchmarks/gpu/timing/amdgpu/CMakeLists.txt b/libc/benchmarks/gpu/timing/amdgpu/CMakeLists.txt
@@ -3,6 +3,7 @@ add_header_library(
   HDRS
     timing.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.common
     libc.src.__support.macros.config
     libc.src.__support.macros.attributes

diff --git a/libc/benchmarks/gpu/timing/amdgpu/timing.h b/libc/benchmarks/gpu/timing/amdgpu/timing.h
@@ -9,6 +9,7 @@
 #ifndef LLVM_LIBC_UTILS_GPU_TIMING_AMDGPU
 #define LLVM_LIBC_UTILS_GPU_TIMING_AMDGPU
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/array.h"
 #include "src/__support/CPP/atomic.h"
 #include "src/__support/CPP/type_traits.h"
@@ -17,8 +18,6 @@
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Returns the overhead associated with calling the profiling region. This

diff --git a/libc/benchmarks/gpu/timing/nvptx/CMakeLists.txt b/libc/benchmarks/gpu/timing/nvptx/CMakeLists.txt
@@ -3,6 +3,7 @@ add_header_library(
   HDRS
     timing.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.common
     libc.src.__support.macros.config
     libc.src.__support.macros.attributes

diff --git a/libc/benchmarks/gpu/timing/nvptx/timing.h b/libc/benchmarks/gpu/timing/nvptx/timing.h
@@ -9,6 +9,7 @@
 #ifndef LLVM_LIBC_UTILS_GPU_TIMING_NVPTX
 #define LLVM_LIBC_UTILS_GPU_TIMING_NVPTX
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/array.h"
 #include "src/__support/CPP/atomic.h"
 #include "src/__support/CPP/type_traits.h"
@@ -17,8 +18,6 @@
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Returns the overhead associated with calling the profiling region. This

diff --git a/libc/config/CMakeLists.txt b/libc/config/CMakeLists.txt
@@ -3,5 +3,6 @@ add_header_library(
   HDRS
     app.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.common
 )
diff --git a/libc/config/gpu/app.h b/libc/config/gpu/app.h
@@ -9,11 +9,10 @@
 #ifndef LLVM_LIBC_CONFIG_GPU_APP_H
 #define LLVM_LIBC_CONFIG_GPU_APP_H
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/architectures.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // TODO: Move other global values here and export them to the host.

diff --git a/libc/config/linux/app.h b/libc/config/linux/app.h
@@ -9,11 +9,10 @@
 #ifndef LLVM_LIBC_CONFIG_LINUX_APP_H
 #define LLVM_LIBC_CONFIG_LINUX_APP_H
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/architectures.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Data structure to capture properties of the linux/ELF TLS image.

diff --git a/libc/config/uefi/app.h b/libc/config/uefi/app.h
@@ -9,13 +9,12 @@
 #ifndef LLVM_LIBC_CONFIG_UEFI_APP_H
 #define LLVM_LIBC_CONFIG_UEFI_APP_H
 
+#include "hdr/stdint_proxy.h"
 #include "include/llvm-libc-types/EFI_HANDLE.h"
 #include "include/llvm-libc-types/EFI_SYSTEM_TABLE.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/architectures.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 
 // Data structure which captures properties of a UEFI application.

diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt
@@ -243,5 +243,14 @@ add_proxy_header_library(
     libc.include.llvm-libc-macros.offsetof_macro
 )
 
+# stdint.h header.
+add_proxy_header_library(
+  stdint_proxy
+  HDRS
+    stdint_proxy.h
+  FULL_BUILD_DEPENDS
+    libc.include.stdint
+)
+
 add_subdirectory(types)
 add_subdirectory(func)
diff --git a/libc/hdr/stdint_proxy.h b/libc/hdr/stdint_proxy.h
@@ -0,0 +1,18 @@
+//===-- stdint.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_STDINT_PROXY_H
+#define LLVM_LIBC_HDR_STDINT_PROXY_H
+
+// This target is to make sure we have correct build order in full build mode,
+// that is `libc.include.stdint` is added to the dependency of all targets
+// that use <stdint.h> header.
+
+#include <stdint.h>
+
+#endif // LLVM_LIBC_HDR_STDINT_PROXY_H
diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt
@@ -94,6 +94,7 @@ add_proxy_header_library(
   DEPENDS
     libc.hdr.fcntl_overlay
   FULL_BUILD_DEPENDS
+    libc.hdr.stdint_proxy
     libc.include.llvm-libc-types.struct_flock
 )
 
@@ -104,6 +105,7 @@ add_proxy_header_library(
   DEPENDS
     libc.hdr.fcntl_overlay
   FULL_BUILD_DEPENDS
+    libc.hdr.stdint_proxy
     libc.include.llvm-libc-types.struct_flock64
 )
 

diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
@@ -101,6 +101,14 @@ add_header_macro(
     .llvm-libc-types.fexcept_t
 )
 
+add_header_macro(
+  stdint
+  ../libc/include/stdint.yaml
+  stdint.h
+  DEPENDS
+    .llvm-libc-macros.stdint_macros
+)
+
 add_header_macro(
   inttypes
   ../libc/include/inttypes.yaml
@@ -109,6 +117,7 @@ add_header_macro(
     .llvm_libc_common_h
     .llvm-libc-types.imaxdiv_t
     .llvm-libc-macros.inttypes_macros
+    .stdint
 )
 
 add_header_macro(
@@ -119,14 +128,6 @@ add_header_macro(
     .llvm-libc-macros.float_macros
 )
 
-add_header_macro(
-  stdint
-  ../libc/include/stdint.yaml
-  stdint.h
-  DEPENDS
-    .llvm-libc-macros.stdint_macros
-)
-
 add_header_macro(
   limits
   ../libc/include/limits.yaml

diff --git a/libc/src/__support/CMakeLists.txt b/libc/src/__support/CMakeLists.txt
@@ -15,6 +15,7 @@ add_header_library(
   HDRS
     block.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.algorithm
     libc.src.__support.CPP.limits
     libc.src.__support.CPP.new
@@ -86,6 +87,7 @@ add_header_library(
     blockstore.h
   DEPENDS
     .libc_assert
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.new
 )
 
@@ -97,6 +99,8 @@ add_header_library(
     macros/properties/architectures.h
     macros/attributes.h
     macros/config.h
+  DEPENDS
+    libc.hdr.stdint_proxy
 )
 
 add_header_library(
@@ -199,6 +203,7 @@ add_header_library(
     integer_to_string.h
   DEPENDS
     .big_int
+    libc.hdr.stdint_proxy
     libc.src.__support.common
     libc.src.__support.CPP.algorithm
     libc.src.__support.CPP.limits
@@ -215,6 +220,7 @@ add_header_library(
     ryu_long_double_constants.h
   DEPENDS
     .libc_assert
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.type_traits
     libc.src.__support.FPUtil.fp_bits
     libc.src.__support.common
@@ -226,6 +232,7 @@ add_header_library(
     high_precision_decimal.h
   DEPENDS
     .str_to_integer
+    libc.hdr.stdint_proxy
 )
 
 add_header_library(
@@ -240,6 +247,7 @@ add_header_library(
     .str_to_num_result
     .uint128
     libc.hdr.errno_macros
+    libc.hdr.stdint_proxy
     libc.src.__support.common
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.limits
@@ -257,6 +265,7 @@ add_header_library(
     integer_literals.h
   DEPENDS
     .uint128
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.limits
 )
 
@@ -290,6 +299,7 @@ add_header_library(
   HDRS
     arg_list.h
   DEPENDS
+    libc.hdr.stdint_proxy
     libc.src.__support.common
 )
 
@@ -329,6 +339,7 @@ add_header_library(
   DEPENDS
     .math_extras
     .number_pair
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.array
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.type_traits
@@ -361,6 +372,7 @@ add_header_library(
     hash.h
   DEPENDS
     .uint128
+    libc.hdr.stdint_proxy
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.limits
     libc.src.__support.macros.attributes

diff --git a/libc/src/__support/CPP/CMakeLists.txt b/libc/src/__support/CPP/CMakeLists.txt
@@ -17,6 +17,7 @@ add_header_library(
   DEPENDS
     .limits
     .type_traits
+    libc.hdr.stdint_proxy
     libc.src.__support.macros.attributes
     libc.src.__support.macros.sanitizer
 )
@@ -39,6 +40,8 @@ add_header_library(
   functional
   HDRS
     functional.h
+  DEPENDS
+    libc.hdr.stdint_proxy
 )
 
 add_header_library(

diff --git a/libc/src/__support/CPP/bit.h b/libc/src/__support/CPP/bit.h
@@ -11,14 +11,13 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_CPP_BIT_H
 #define LLVM_LIBC_SRC___SUPPORT_CPP_BIT_H
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/limits.h" // numeric_limits
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/sanitizer.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace cpp {
 

diff --git a/libc/src/__support/CPP/functional.h b/libc/src/__support/CPP/functional.h
@@ -9,6 +9,7 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_CPP_FUNCTIONAL_H
 #define LLVM_LIBC_SRC___SUPPORT_CPP_FUNCTIONAL_H
 
+#include "hdr/stdint_proxy.h"
 #include "src/__support/CPP/type_traits/enable_if.h"
 #include "src/__support/CPP/type_traits/is_convertible.h"
 #include "src/__support/CPP/type_traits/is_same.h"
@@ -19,8 +20,6 @@
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
 
-#include <stdint.h>
-
 namespace LIBC_NAMESPACE_DECL {
 namespace cpp {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ add_header_library( @@
       HDRS
         app.h
       DEPENDS
+        libc.hdr.stdint_proxy
         libc.src.__support.common
     )