diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-12-18 00:13:29 +0000 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2022-12-18 00:13:29 +0000 |
| commit | ae3e228af77fea9ff4c45cca88a7a0de2cad662b (patch) | |
| tree | 46c1afe6ae8289d2936dd5eeed32d0f62fc126cf | |
| parent | 4244cab23afcee5c3515d67d6d340cf82ce5289f (diff) | |
| download | llvm-ae3e228af77fea9ff4c45cca88a7a0de2cad662b.zip llvm-ae3e228af77fea9ff4c45cca88a7a0de2cad662b.tar.gz llvm-ae3e228af77fea9ff4c45cca88a7a0de2cad662b.tar.bz2 | |
cmake: 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. seek 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 to actual compile, this test was incomplete too
since libc implementations like musl has 64bit off_t by default on 32bit
systems and does not bundle[2] -D_LARGEFILE64_SOURCE 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. 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
Reviewed By: MaskRay
Differential Revision: https://reviews.llvm.org/D139752
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 8 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/config.h.cmake | 3 | ||||
| -rw-r--r-- | llvm/lib/Support/raw_ostream.cpp | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index f58f3b1..856093e 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES) 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) @@ -340,6 +337,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) if( LLVM_USING_GLIBC ) add_compile_definitions(_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_definitions( -D_FILE_OFFSET_BITS=64 ) + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") + endif() endif() # This check requires _GNU_SOURCE. diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index 3543e6f..29ac536 100644 --- 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} diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp index 92b15f1..8943c44 100644 --- a/llvm/lib/Support/raw_ostream.cpp +++ b/llvm/lib/Support/raw_ostream.cpp @@ -802,8 +802,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { 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 |