[libc] Refactoring getauxval to use internal functions #144451
+345
−141
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
uzairnawaz
commented
Jun 16, 2025
uzairnawaz
commented
- made mmap an internal function; called internal function in getauxval
- refactored to make munmap an internal function
- switching to erroror for internal functions, not complete
- switching to erroror for internal functions, not complete
- made internal function for read; removed errno guard class in getauxval
|
@llvm/pr-subscribers-libc Author: Uzair Nawaz (uzairnawaz) Changes
Patch is 27.33 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/144451.diff 17 Files Affected:
diff --git a/libc/src/__support/OSUtil/linux/CMakeLists.txt b/libc/src/__support/OSUtil/linux/CMakeLists.txt
index 4681d8c2bb73c..5c3f0342b9d9f 100644
--- a/libc/src/__support/OSUtil/linux/CMakeLists.txt
+++ b/libc/src/__support/OSUtil/linux/CMakeLists.txt
@@ -9,6 +9,10 @@ add_object_library(
SRCS
exit.cpp
fcntl.cpp
+ mmap.cpp
+ munmap.cpp
+ prctl.cpp
+ read.cpp
HDRS
io.h
syscall.h
@@ -22,6 +26,10 @@ add_object_library(
libc.hdr.types.struct_f_owner_ex
libc.hdr.types.off_t
libc.include.sys_syscall
+ libc.src.__support.macros.sanitizer
+ libc.hdr.types.size_t
+ libc.hdr.types.ssize_t
+ libc.include.unistd
)
add_header_library(
diff --git a/libc/src/__support/OSUtil/linux/mmap.cpp b/libc/src/__support/OSUtil/linux/mmap.cpp
new file mode 100644
index 0000000000000..9e27701e73572
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/mmap.cpp
@@ -0,0 +1,65 @@
+//===------ Linux implementation of the POSIX mmap function -----*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/__support/OSUtil/mmap.h"
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+#include "src/__support/common.h"
+#include "src/__support/error_or.h"
+
+#include "src/__support/macros/config.h"
+#include <linux/param.h> // For EXEC_PAGESIZE.
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+// This function is currently linux only. It has to be refactored suitably if
+// mmap is to be supported on non-linux operating systems also.
+ErrorOr<void *> mmap(void *addr, size_t size, int prot, int flags, int fd,
+ off_t offset) {
+ // A lot of POSIX standard prescribed validation of the parameters is not
+ // done in this function as modern linux versions do it in the syscall.
+ // TODO: Perform argument validation not done by the linux syscall.
+
+ // EXEC_PAGESIZE is used for the page size. While this is OK for x86_64, it
+ // might not be correct in general.
+ // TODO: Use pagesize read from the ELF aux vector instead of EXEC_PAGESIZE.
+
+#ifdef SYS_mmap2
+ offset /= EXEC_PAGESIZE;
+ long syscall_number = SYS_mmap2;
+#elif defined(SYS_mmap)
+ long syscall_number = SYS_mmap;
+#else
+#error "mmap or mmap2 syscalls not available."
+#endif
+
+ // We add an explicit cast to silence a "implicit conversion loses integer
+ // precision" warning when compiling for 32-bit systems.
+ long mmap_offset = static_cast<long>(offset);
+ long ret =
+ LIBC_NAMESPACE::syscall_impl(syscall_number, reinterpret_cast<long>(addr),
+ size, prot, flags, fd, mmap_offset);
+
+ // The mmap/mmap2 syscalls return negative values on error. These negative
+ // values are actually the negative values of the error codes. So, fix them
+ // up in case an error code is detected.
+ //
+ // A point to keep in mind for the fix up is that a negative return value
+ // from the syscall can also be an error-free value returned by the syscall.
+ // However, since a valid return address cannot be within the last page, a
+ // return value corresponding to a location in the last page is an error
+ // value.
+ if (ret < 0 && ret > -EXEC_PAGESIZE)
+ return Error(static_cast<int>(-ret));
+
+ return reinterpret_cast<void *>(ret);
+}
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/OSUtil/linux/munmap.cpp b/libc/src/__support/OSUtil/linux/munmap.cpp
new file mode 100644
index 0000000000000..6a11bae263f13
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/munmap.cpp
@@ -0,0 +1,34 @@
+//===---- Linux implementation of the POSIX munmap function -----*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/__support/OSUtil/munmap.h"
+
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+#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 internal {
+
+// This function is currently linux only. It has to be refactored suitably if
+// munmap is to be supported on non-linux operating systems also.
+ErrorOr<int> munmap(void *addr, size_t size) {
+ int ret = LIBC_NAMESPACE::syscall_impl<int>(
+ SYS_munmap, reinterpret_cast<long>(addr), size);
+
+ if (ret < 0)
+ return Error(-ret);
+
+ return 0;
+}
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/OSUtil/linux/prctl.cpp b/libc/src/__support/OSUtil/linux/prctl.cpp
new file mode 100644
index 0000000000000..9f5f2d719c7f4
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/prctl.cpp
@@ -0,0 +1,39 @@
+//===---- Linux implementation of the prctl function ------------*- C++-*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/__support/OSUtil/prctl.h"
+
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+
+#include "src/__support/error_or.h"
+#include "src/__support/macros/config.h"
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<int> prctl(int option, unsigned long arg2, unsigned long arg3,
+ unsigned long arg4, unsigned long arg5) {
+ long ret =
+ LIBC_NAMESPACE::syscall_impl(SYS_prctl, option, arg2, arg3, arg4, arg5);
+
+ // The manpage states that "... return the nonnegative values described
+ // above. All other option values return 0 on success. On error,
+ // -1 is returned, and errno is set to indicate the error."
+ // According to the kernel implementation
+ // (https://github.com/torvalds/linux/blob/bee0e7762ad2c6025b9f5245c040fcc36ef2bde8/kernel/sys.c#L2442),
+ // return value from the syscall is set to 0 on default so we do not need to
+ // set the value on success manually.
+ if (ret < 0)
+ return Error(static_cast<int>(-ret));
+
+ return static_cast<int>(ret);
+}
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/OSUtil/linux/read.cpp b/libc/src/__support/OSUtil/linux/read.cpp
new file mode 100644
index 0000000000000..88b6c9c754f68
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/read.cpp
@@ -0,0 +1,32 @@
+//===-- Linux implementation of read --------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/__support/OSUtil/read.h"
+
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+#include "src/__support/common.h"
+#include "src/__support/macros/config.h"
+#include "src/__support/macros/sanitizer.h" // for MSAN_UNPOISON
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<ssize_t> read(int fd, void *buf, size_t count) {
+ ssize_t ret = LIBC_NAMESPACE::syscall_impl<ssize_t>(SYS_read, fd, buf, count);
+ if (ret < 0)
+ return Error(static_cast<int>(-ret));
+
+ // The cast is important since there is a check that dereferences the pointer
+ // which fails on void*.
+ MSAN_UNPOISON(reinterpret_cast<char *>(buf), count);
+ return ret;
+}
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/OSUtil/mmap.h b/libc/src/__support/OSUtil/mmap.h
new file mode 100644
index 0000000000000..6d91bd5477f95
--- /dev/null
+++ b/libc/src/__support/OSUtil/mmap.h
@@ -0,0 +1,24 @@
+//===----------- Implementation header of the mmap function -----*- C++ -*-===//
+//
+// 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_SRC___SUPPORT_OSUTIL_MMAP_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_MMAP_H
+
+#include "src/__support/macros/config.h"
+#include "src/__support/error_or.h"
+#include <sys/mman.h> // For size_t and off_t
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<void*> mmap(void *addr, size_t size, int prot, int flags, int fd, off_t offset);
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_MMAP_H
diff --git a/libc/src/__support/OSUtil/munmap.h b/libc/src/__support/OSUtil/munmap.h
new file mode 100644
index 0000000000000..5e1a961f4d654
--- /dev/null
+++ b/libc/src/__support/OSUtil/munmap.h
@@ -0,0 +1,24 @@
+//===--------- Implementation header of the munmap function -----*- C++ -*-===//
+//
+// 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_SRC___SUPPORT_OSUTIL_MUNMAP_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_MUNMAP_H
+
+#include "src/__support/error_or.h"
+#include "src/__support/macros/config.h"
+#include <sys/mman.h> // For size_t and off_t
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<int> munmap(void *addr, size_t size);
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_MUNMAP_H
diff --git a/libc/src/__support/OSUtil/prctl.h b/libc/src/__support/OSUtil/prctl.h
new file mode 100644
index 0000000000000..fd8ddf0829985
--- /dev/null
+++ b/libc/src/__support/OSUtil/prctl.h
@@ -0,0 +1,26 @@
+//===--------- Implementation header of the prctl function -----*- C++ -*-===//
+//
+// 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_SRC___SUPPORT_OSUTIL_PRCTL_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_PRCTL_H
+
+#include "src/__support/error_or.h"
+#include "src/__support/libc_errno.h"
+#include "src/__support/macros/config.h"
+#include <sys/prctl.h>
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<int> prctl(int option, unsigned long arg2, unsigned long arg3,
+ unsigned long arg4, unsigned long arg5);
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_PRCTL_H
diff --git a/libc/src/__support/OSUtil/read.h b/libc/src/__support/OSUtil/read.h
new file mode 100644
index 0000000000000..0e29fc36cfa24
--- /dev/null
+++ b/libc/src/__support/OSUtil/read.h
@@ -0,0 +1,26 @@
+//===--------- Implementation header of the read function -------*- C++ -*-===//
+//
+// 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_SRC___SUPPORT_OSUTIL_READ_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_READ_H
+
+#include "hdr/types/size_t.h"
+#include "hdr/types/ssize_t.h"
+#include "hdr/unistd_macros.h"
+#include "src/__support/macros/config.h"
+#include "src/__support/error_or.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace internal {
+
+ErrorOr<ssize_t> read(int fd, void *buf, size_t count);
+
+} // namespace internal
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_READ_H
diff --git a/libc/src/sys/auxv/linux/CMakeLists.txt b/libc/src/sys/auxv/linux/CMakeLists.txt
index 4884184cc6053..d21754874830d 100644
--- a/libc/src/sys/auxv/linux/CMakeLists.txt
+++ b/libc/src/sys/auxv/linux/CMakeLists.txt
@@ -6,10 +6,9 @@ add_entrypoint_object(
../getauxval.h
DEPENDS
libc.src.sys.prctl.prctl
- libc.src.sys.mman.mmap
- libc.src.sys.mman.munmap
libc.src.__support.threads.callonce
libc.src.__support.common
+ libc.src.__support.OSUtil.osutil
libc.src.errno.errno
libc.config.app_h
libc.src.fcntl.open
diff --git a/libc/src/sys/auxv/linux/getauxval.cpp b/libc/src/sys/auxv/linux/getauxval.cpp
index b50c5845bcc2b..113aeb500b73e 100644
--- a/libc/src/sys/auxv/linux/getauxval.cpp
+++ b/libc/src/sys/auxv/linux/getauxval.cpp
@@ -11,6 +11,7 @@
#include "hdr/fcntl_macros.h"
#include "src/__support/OSUtil/fcntl.h"
#include "src/__support/common.h"
+#include "src/__support/error_or.h"
#include "src/__support/libc_errno.h"
#include "src/__support/macros/config.h"
#include <linux/auxvec.h>
@@ -19,19 +20,13 @@
#include "src/__support/threads/callonce.h"
#include "src/__support/threads/linux/futex_word.h"
-// -----------------------------------------------------------------------------
-// TODO: This file should not include other public libc functions. Calling other
-// public libc functions is an antipattern within LLVM-libc. This needs to be
-// cleaned up. DO NOT COPY THIS.
-// -----------------------------------------------------------------------------
-
// for mallocing the global auxv
-#include "src/sys/mman/mmap.h"
-#include "src/sys/mman/munmap.h"
+#include "src/__support/OSUtil/mmap.h"
+#include "src/__support/OSUtil/munmap.h"
// for reading /proc/self/auxv
-#include "src/sys/prctl/prctl.h"
-#include "src/unistd/read.h"
+#include "src/__support/OSUtil/prctl.h"
+#include "src/__support/OSUtil/read.h"
// getauxval will work either with or without __cxa_atexit support.
// In order to detect if __cxa_atexit is supported, we define a weak symbol.
@@ -46,18 +41,6 @@ namespace LIBC_NAMESPACE_DECL {
constexpr static size_t MAX_AUXV_ENTRIES = 64;
-// Helper to recover or set errno
-class AuxvErrnoGuard {
-public:
- AuxvErrnoGuard() : saved(libc_errno), failure(false) {}
- ~AuxvErrnoGuard() { libc_errno = failure ? ENOENT : saved; }
- void mark_failure() { failure = true; }
-
-private:
- int saved;
- bool failure;
-};
-
// Helper to manage the memory
static AuxEntry *auxv = nullptr;
@@ -66,18 +49,17 @@ class AuxvMMapGuard {
constexpr static size_t AUXV_MMAP_SIZE = sizeof(AuxEntry) * MAX_AUXV_ENTRIES;
AuxvMMapGuard()
- : ptr(LIBC_NAMESPACE::mmap(nullptr, AUXV_MMAP_SIZE,
- PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)) {}
+ : ptr(internal::mmap(nullptr, AUXV_MMAP_SIZE, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)) {}
~AuxvMMapGuard() {
- if (ptr != MAP_FAILED)
- LIBC_NAMESPACE::munmap(ptr, AUXV_MMAP_SIZE);
+ if (ptr.has_value())
+ internal::munmap(ptr.value(), AUXV_MMAP_SIZE);
}
void submit_to_global() {
// atexit may fail, we do not set it to global in that case.
int ret = __cxa_atexit(
[](void *) {
- LIBC_NAMESPACE::munmap(auxv, AUXV_MMAP_SIZE);
+ internal::munmap(auxv, AUXV_MMAP_SIZE);
auxv = nullptr;
},
nullptr, nullptr);
@@ -85,14 +67,14 @@ class AuxvMMapGuard {
if (ret != 0)
return;
- auxv = reinterpret_cast<AuxEntry *>(ptr);
- ptr = MAP_FAILED;
+ auxv = reinterpret_cast<AuxEntry *>(ptr.value());
+ ptr = Error(-1);
}
- bool allocated() const { return ptr != MAP_FAILED; }
- void *get() const { return ptr; }
+ bool allocated() const { return ptr.has_value(); }
+ void *get() const { return ptr.value(); }
private:
- void *ptr;
+ ErrorOr<void *> ptr;
};
class AuxvFdGuard {
@@ -133,9 +115,9 @@ static void initialize_auxv_once(void) {
// is compiled and run on separate kernels, we also check the return value of
// prctl.
#ifdef PR_GET_AUXV
- int ret = prctl(PR_GET_AUXV, reinterpret_cast<unsigned long>(ptr),
- available_size, 0, 0);
- if (ret >= 0) {
+ auto ret = internal::prctl(PR_GET_AUXV, reinterpret_cast<unsigned long>(ptr),
+ available_size, 0, 0);
+ if (ret.has_value()) {
mmap_guard.submit_to_global();
return;
}
@@ -144,23 +126,22 @@ static void initialize_auxv_once(void) {
if (!fd_guard.valid())
return;
auto *buf = reinterpret_cast<char *>(ptr);
- libc_errno = 0;
bool error_detected = false;
// Read until we use up all the available space or we finish reading the file.
while (available_size != 0) {
- ssize_t bytes_read =
- LIBC_NAMESPACE::read(fd_guard.get(), buf, available_size);
- if (bytes_read <= 0) {
- if (libc_errno == EINTR)
+ auto bytes_read = internal::read(fd_guard.get(), buf, available_size);
+ if (!bytes_read.has_value() ||
+ (bytes_read.has_value() && bytes_read.value() == 0)) {
+ if (bytes_read.error() == EINTR)
continue;
// Now, we either have an non-recoverable error or we have reached the end
// of the file. Mark `error_detected` accordingly.
- if (bytes_read == -1)
+ if (!bytes_read.has_value())
error_detected = true;
break;
}
- buf += bytes_read;
- available_size -= bytes_read;
+ buf += bytes_read.value();
+ available_size -= bytes_read.value();
}
// If we get out of the loop without an error, the auxv is ready.
if (!error_detected)
@@ -172,17 +153,17 @@ static AuxEntry read_entry(int fd) {
size_t size = sizeof(AuxEntry);
char *ptr = reinterpret_cast<char *>(&buf);
while (size > 0) {
- ssize_t ret = LIBC_NAMESPACE::read(fd, ptr, size);
- if (ret < 0) {
- if (libc_errno == EINTR)
+ auto ret = internal::read(fd, ptr, size);
+ if (!ret.has_value()) {
+ if (ret.error() == EINTR)
continue;
// Error detected, return AT_NULL
buf.id = AT_NULL;
buf.value = AT_NULL;
break;
}
- ptr += ret;
- size -= ret;
+ ptr += ret.value();
+ size -= ret.value();
}
return buf;
}
@@ -191,15 +172,13 @@ LLVM_LIBC_FUNCTION(unsigned long, getauxval, (unsigned long id)) {
// Fast path when libc is loaded by its own initialization code. In this case,
// app.auxv_ptr is already set to the auxv passed on the initial stack of the
// process.
- AuxvErrnoGuard errno_guard;
- auto search_auxv = [&errno_guard](AuxEntry *auxv,
- unsigned long id) -> AuxEntryType {
+ auto search_auxv = [](AuxEntry *auxv, unsigned long id) -> AuxEntryType {
for (auto *ptr = auxv; ptr->id != AT_NULL; ptr++)
if (ptr->id == id)
return ptr->value;
- errno_guard.mark_failure();
+ libc_errno = ENOENT;
return AT_NULL;
};
@@ -227,7 +206,7 @@ LLVM_LIBC_FUNCTION(unsigned long, getauxval, (unsigned long id)) {
}
// cannot find the entry after all methods, mark failure and return 0
- errno_guard.mark_failure();
+ libc_errno = ENOENT;
return AT_NULL;
}
} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/sys/mman/linux/CMakeLists.txt b/libc/src/sys/mman/linux/CMakeLists.txt
index 89a0ad1527a06..60421c47c4053 100644
--- a/libc/src/sys/mman/linux/CMakeLists.txt
+++ b/libc/src/sys/mman/linux/CMakeLists.txt
@@ -18,8 +18,6 @@ add_entrypoint_object(
HDRS
../mmap.h
DEPENDS
- libc.include.sys_mman
- libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -44,8 +42,6 @@ add_entrypoint_object(
HDRS
../munmap.h
DEPENDS
- libc.include.sys_mman
- libc.include.sys_syscall
...
[truncated]
|
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions h,cpp -- libc/src/__support/OSUtil/linux/mmap.cpp libc/src/__support/OSUtil/linux/munmap.cpp libc/src/__support/OSUtil/linux/prctl.cpp libc/src/__support/OSUtil/linux/read.cpp libc/src/__support/OSUtil/mmap.h libc/src/__support/OSUtil/munmap.h libc/src/__support/OSUtil/prctl.h libc/src/__support/OSUtil/read.h libc/src/sys/auxv/linux/getauxval.cpp libc/src/sys/mman/linux/mmap.cpp libc/src/sys/mman/linux/munmap.cpp libc/src/sys/prctl/linux/prctl.cpp libc/src/unistd/linux/read.cppView the diff from clang-format here.diff --git a/libc/src/__support/OSUtil/linux/mmap.cpp b/libc/src/__support/OSUtil/linux/mmap.cpp
index 05dc79c46..d0c18e61d 100644
--- a/libc/src/__support/OSUtil/linux/mmap.cpp
+++ b/libc/src/__support/OSUtil/linux/mmap.cpp
@@ -12,9 +12,9 @@
#include "src/__support/error_or.h"
#include "src/__support/macros/config.h"
-#include <linux/param.h> // For EXEC_PAGESIZE.
-#include <sys/syscall.h> // For syscall numbers.
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
+#include <linux/param.h> // For EXEC_PAGESIZE.
+#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
namespace internal {
diff --git a/libc/src/__support/OSUtil/linux/prctl.cpp b/libc/src/__support/OSUtil/linux/prctl.cpp
index e701b531c..bd91c5abc 100644
--- a/libc/src/__support/OSUtil/linux/prctl.cpp
+++ b/libc/src/__support/OSUtil/linux/prctl.cpp
@@ -13,7 +13,7 @@
#include "src/__support/error_or.h"
#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-#include <sys/syscall.h> // For syscall numbers.
+#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
namespace internal {
|
lntue
reviewed
Jun 16, 2025
| @@ -9,6 +9,10 @@ add_object_library( | |||
| SRCS | |||
| exit.cpp | |||
| fcntl.cpp | |||
| mmap.cpp | |||
There was a problem hiding this comment.
These functions are mostly few liners. Consider put them into header-only implementations, and create independent cmake targets with add_header_library for each one of them.
lntue
reviewed
Jun 17, 2025
lntue
reviewed
Jun 17, 2025
lntue
reviewed
Jun 17, 2025
lntue
reviewed
Jun 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.