[libc-commits] [libc] [libcxx] [llvm] [libc] Fix elf_proxy header generation (PR #213737)

[Michael Jones via libc-commits]

https://github.com/michaelrj-google updated https://github.com/llvm/llvm-project/pull/213737

>From e2b4a69e4b16153808f9411e3deeb342e9eee945 Mon Sep 17 00:00:00 2001
From: Michael Jones <michaelrj at google.com>
Date: Mon, 3 Aug 2026 18:24:56 +0000
Subject: [PATCH 1/3] [libc] Fix elf_proxy header generation

Followup to fix the generated proxy header after #211428.

Assisted-by: Automated tooling, human reviewed.
---
 libc/include/llvm-libc-proxy/CMakeLists.txt | 1 -
 libc/include/llvm-libc-proxy/elf_proxy.yaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libc/include/llvm-libc-proxy/CMakeLists.txt b/libc/include/llvm-libc-proxy/CMakeLists.txt
index 56409c8f1e627..31196c6532d76 100644
--- a/libc/include/llvm-libc-proxy/CMakeLists.txt
+++ b/libc/include/llvm-libc-proxy/CMakeLists.txt
@@ -55,5 +55,4 @@ add_gen_header(
     libc.include.llvm-libc-types.Elf64_Word
     libc.include.llvm-libc-types.Elf64_Xword
     libc.include.llvm-libc-types.Elf64_auxv_t
-  PROXY
 )
diff --git a/libc/include/llvm-libc-proxy/elf_proxy.yaml b/libc/include/llvm-libc-proxy/elf_proxy.yaml
index 2b11dfe2a343f..f0b629cf7aaf9 100644
--- a/libc/include/llvm-libc-proxy/elf_proxy.yaml
+++ b/libc/include/llvm-libc-proxy/elf_proxy.yaml
@@ -1,4 +1,4 @@
-header: elf.h
+header: elf_proxy.h
 standards:
   - svid
 macros:

>From 48167d20115b518e6f14323010e833e043606ce0 Mon Sep 17 00:00:00 2001
From: Michael Jones <michaelrj at google.com>
Date: Mon, 3 Aug 2026 18:51:22 +0000
Subject: [PATCH 2/3] fix bazel

---
 utils/bazel/llvm-project-overlay/libc/BUILD.bazel | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index eb677491e0fb7..89d01c221cfd4 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -190,10 +190,7 @@ LLVM_LIBC_HEADERS = [
     ),
     libc_header_info("nl_types"),
     libc_header_info("poll"),
-    libc_header_info(
-        "llvm-libc-proxy/elf_proxy",
-        proxy = True,
-    ),
+    libc_header_info("llvm-libc-proxy/elf_proxy"),
     libc_header_info("pthread"),
     libc_header_info("sched"),
     libc_header_info("search"),

>From 1f5f3c34fb59990928ddfd58b7395044b612fd08 Mon Sep 17 00:00:00 2001
From: Michael Jones <michaelrj at google.com>
Date: Mon, 3 Aug 2026 18:51:33 +0000
Subject: [PATCH 3/3] (temporary) touch libcxx file to run the presubmits

---
 libcxx/src/algorithm.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libcxx/src/algorithm.cpp b/libcxx/src/algorithm.cpp
index bbfbb3885f1c3..3eb6581d29f09 100644
--- a/libcxx/src/algorithm.cpp
+++ b/libcxx/src/algorithm.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+
 #include <algorithm>
 #include <bit>