[llvm-branch-commits] [libc] [llvm] [libc] Use a syscall wrapper for auxv (PR #242255)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Nov 13 02:52:10 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libc
Author: Connector Switch (c8ef)
<details>
<summary>Changes</summary>
This PR move auxv initialization behind the centralized syscall wrappers, following libc/docs/dev/syscall_wrapper_refactor.md.
---
Full diff: https://github.com/llvm/llvm-project/pull/242255.diff
5 Files Affected:
- (modified) libc/src/__support/OSUtil/linux/CMakeLists.txt (+1-1)
- (modified) libc/src/__support/OSUtil/linux/auxv.h (+7-8)
- (modified) libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt (+12)
- (added) libc/src/__support/OSUtil/linux/syscall_wrappers/prctl.h (+35)
- (modified) utils/bazel/llvm-project-overlay/libc/BUILD.bazel (+16-1)
``````````diff
diff --git a/libc/src/__support/OSUtil/linux/CMakeLists.txt b/libc/src/__support/OSUtil/linux/CMakeLists.txt
index 93d24f80ecda8..895621614e0dd 100644
--- a/libc/src/__support/OSUtil/linux/CMakeLists.txt
+++ b/libc/src/__support/OSUtil/linux/CMakeLists.txt
@@ -34,8 +34,8 @@ add_header_library(
libc.src.__support.OSUtil.linux.syscall_wrappers.mmap
libc.src.__support.OSUtil.linux.syscall_wrappers.munmap
libc.src.__support.OSUtil.linux.syscall_wrappers.open
+ libc.src.__support.OSUtil.linux.syscall_wrappers.prctl
libc.src.__support.OSUtil.linux.syscall_wrappers.read
- libc.src.__support.OSUtil.osutil
libc.src.__support.common
libc.src.__support.CPP.optional
libc.src.__support.threads.callonce
diff --git a/libc/src/__support/OSUtil/linux/auxv.h b/libc/src/__support/OSUtil/linux/auxv.h
index a6c28e078fdb8..ecfa203e5c392 100644
--- a/libc/src/__support/OSUtil/linux/auxv.h
+++ b/libc/src/__support/OSUtil/linux/auxv.h
@@ -17,14 +17,13 @@
#include "src/__support/OSUtil/linux/syscall_wrappers/mmap.h"
#include "src/__support/OSUtil/linux/syscall_wrappers/munmap.h"
#include "src/__support/OSUtil/linux/syscall_wrappers/open.h"
+#include "src/__support/OSUtil/linux/syscall_wrappers/prctl.h"
#include "src/__support/OSUtil/linux/syscall_wrappers/read.h"
-#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
#include "src/__support/threads/callonce.h"
-#include <linux/param.h> // For EXEC_PAGESIZE
-#include <linux/prctl.h> // For prctl
-#include <sys/syscall.h> // For syscall numbers
+#include <linux/param.h> // For EXEC_PAGESIZE
+#include <linux/prctl.h> // For prctl
namespace LIBC_NAMESPACE_DECL {
@@ -106,10 +105,10 @@ LIBC_INLINE void Vector::fallback_initialize_unsync() {
// Attempt 1: use PRCTL to get the auxv.
// We guarantee that the vector is always padded with AT_NULL entries.
#ifdef PR_GET_AUXV
- long prctl_ret = syscall_impl<long>(SYS_prctl, PR_GET_AUXV,
- reinterpret_cast<unsigned long>(vector),
- avaiable_size, 0, 0);
- if (prctl_ret >= 0) {
+ auto prctl_ret = linux_syscalls::prctl(
+ PR_GET_AUXV, reinterpret_cast<unsigned long>(vector), avaiable_size, 0,
+ 0);
+ if (prctl_ret) {
entries = vector;
return;
}
diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
index a59095fa8d802..1f6425d6161d1 100644
--- a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
@@ -2032,6 +2032,18 @@ add_header_library(
libc.include.sys_syscall
)
+add_header_library(
+ prctl
+ HDRS
+ prctl.h
+ DEPENDS
+ libc.include.sys_syscall
+ libc.src.__support.OSUtil.osutil
+ libc.src.__support.common
+ libc.src.__support.error_or
+ libc.src.__support.macros.config
+)
+
add_header_library(
prlimit
HDRS
diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/prctl.h b/libc/src/__support/OSUtil/linux/syscall_wrappers/prctl.h
new file mode 100644
index 0000000000000..bf240db823075
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/prctl.h
@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// Syscall wrapper for prctl.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_PRCTL_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_PRCTL_H
+
+#include "src/__support/OSUtil/linux/syscall.h" // syscall_checked
+#include "src/__support/common.h"
+#include "src/__support/error_or.h"
+#include "src/__support/macros/config.h"
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+namespace linux_syscalls {
+
+LIBC_INLINE ErrorOr<long> prctl(int option, unsigned long arg2,
+ unsigned long arg3, unsigned long arg4,
+ unsigned long arg5) {
+ return syscall_checked<long>(SYS_prctl, option, arg2, arg3, arg4, arg5);
+}
+
+} // namespace linux_syscalls
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_PRCTL_H
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 42b28b1c01fb2..0eef1a9f0c7ee 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -3722,6 +3722,21 @@ libc_support_library(
],
)
+libc_support_library(
+ name = "__support_osutil_linux_syscall_wrappers_prctl",
+ hdrs = ["src/__support/OSUtil/linux/syscall_wrappers/prctl.h"],
+ target_compatible_with = select({
+ "@platforms//os:linux": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ deps = [
+ ":__support_common",
+ ":__support_error_or",
+ ":__support_macros_config",
+ ":__support_osutil_syscall",
+ ],
+)
+
libc_support_library(
name = "__support_osutil_linux_syscall_wrappers_pread",
hdrs = ["src/__support/OSUtil/linux/syscall_wrappers/pread.h"],
@@ -5190,8 +5205,8 @@ libc_support_library(
":__support_osutil_linux_syscall_wrappers_mmap",
":__support_osutil_linux_syscall_wrappers_munmap",
":__support_osutil_linux_syscall_wrappers_open",
+ ":__support_osutil_linux_syscall_wrappers_prctl",
":__support_osutil_linux_syscall_wrappers_read",
- ":__support_osutil_syscall",
":__support_threads_callonce",
":hdr_errno_macros",
":hdr_fcntl_macros",
``````````
</details>
https://github.com/llvm/llvm-project/pull/242255
More information about the llvm-branch-commits
mailing list