Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 28 Dec 2022 18:24:21 -0800 |
| 4 | Subject: [PATCH] direct_mmap: Use off_t on linux |
| 5 | |
| 6 | off64_t is not provided without defining _LARGEFILE64_SOURCE on musl |
| 7 | this define is not defined automatically like glibc where it gets |
| 8 | defined when _GNU_SOURCE is defined. Using off_t makes it portable |
| 9 | across musl/glibc and for using 64bit off_t on glibc 32bit systems |
| 10 | -D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | absl/base/internal/direct_mmap.h | 4 ++-- |
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h |
| 19 | index 815b8d23..fdf88f0b 100644 |
| 20 | --- a/absl/base/internal/direct_mmap.h |
| 21 | +++ b/absl/base/internal/direct_mmap.h |
| 22 | @@ -72,7 +72,7 @@ namespace base_internal { |
| 23 | // Platform specific logic extracted from |
| 24 | // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h |
| 25 | inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, |
| 26 | - off64_t offset) noexcept { |
| 27 | + off_t offset) noexcept { |
| 28 | #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ |
| 29 | defined(__m68k__) || defined(__sh__) || \ |
| 30 | (defined(__hppa__) && !defined(__LP64__)) || \ |
| 31 | @@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, |
| 32 | #else |
| 33 | return reinterpret_cast<void*>( |
| 34 | syscall(SYS_mmap2, start, length, prot, flags, fd, |
| 35 | - static_cast<off_t>(offset / pagesize))); |
| 36 | + offset / pagesize)); |
| 37 | #endif |
| 38 | #elif defined(__s390x__) |
| 39 | // On s390x, mmap() arguments are passed in memory. |
| 40 | -- |
| 41 | 2.39.0 |
| 42 | |