| From cd2fa12d715929642513fc441287c402f4560096 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sun, 25 Dec 2022 15:13:41 -0800 |
| Subject: [PATCH] build: Enable 64bit off_t on 32bit glibc systems |
| |
| Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based |
| systems. This will make sure that 64bit versions of LFS functions are |
| used e.g. lseek will behave same as lseek64. Also revert [1] partially |
| because this added a cmake test to detect lseek64 but then forgot to |
| pass the needed macro during actual compile, this test was incomplete too |
| since libc implementations like musl has 64-bit off_t by default on 32-bit |
| systems and does not bundle -D_LARGEFILE64_SOURCE [2] under -D_GNU_SOURCE |
| like glibc, which means the compile now fails on musl because the cmake |
| check passes but we do not have _LARGEFILE64_SOURCE defined. Moreover, |
| Using the *64 function was transitional anyways so use |
| -D_FILE_OFFSET_BITS=64 instead |
| |
| [1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b |
| [2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc |
| |
| Upstream-Status: Submitted [https://reviews.llvm.org/D139752] |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| llvm/cmake/config-ix.cmake | 8 +++++--- |
| llvm/include/llvm/Config/config.h.cmake | 3 --- |
| llvm/lib/Support/raw_ostream.cpp | 2 -- |
| llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 -- |
| utils/bazel/llvm-project-overlay/llvm/config.bzl | 1 - |
| .../llvm/include/llvm/Config/config.h | 3 --- |
| utils/bazel/llvm_configs/config.h.cmake | 3 --- |
| 7 files changed, 5 insertions(+), 17 deletions(-) |
| |
| --- a/llvm/cmake/config-ix.cmake |
| +++ b/llvm/cmake/config-ix.cmake |
| @@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h H |
| if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) |
| check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) |
| endif() |
| -set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") |
| -check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) |
| -set(CMAKE_REQUIRED_DEFINITIONS "") |
| check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) |
| check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) |
| check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) |
| @@ -350,6 +347,11 @@ check_symbol_exists(__GLIBC__ stdio.h LL |
| if( LLVM_USING_GLIBC ) |
| add_definitions( -D_GNU_SOURCE ) |
| list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE") |
| +# enable 64bit off_t on 32bit systems using glibc |
| + if (CMAKE_SIZEOF_VOID_P EQUAL 4) |
| + add_compile_definitions(_FILE_OFFSET_BITS=64) |
| + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") |
| + endif() |
| endif() |
| # This check requires _GNU_SOURCE |
| if (NOT PURE_WINDOWS) |
| --- a/llvm/include/llvm/Config/config.h.cmake |
| +++ b/llvm/include/llvm/Config/config.h.cmake |
| @@ -128,9 +128,6 @@ |
| /* Define to 1 if you have the <link.h> header file. */ |
| #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} |
| |
| -/* Define to 1 if you have the `lseek64' function. */ |
| -#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} |
| - |
| /* Define to 1 if you have the <mach/mach.h> header file. */ |
| #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} |
| |
| --- a/llvm/lib/Support/raw_ostream.cpp |
| +++ b/llvm/lib/Support/raw_ostream.cpp |
| @@ -804,8 +804,6 @@ uint64_t raw_fd_ostream::seek(uint64_t o |
| flush(); |
| #ifdef _WIN32 |
| pos = ::_lseeki64(FD, off, SEEK_SET); |
| -#elif defined(HAVE_LSEEK64) |
| - pos = ::lseek64(FD, off, SEEK_SET); |
| #else |
| pos = ::lseek(FD, off, SEEK_SET); |
| #endif |