This is an archive of the discontinued LLVM Phabricator instance.

Differential D140812

[sanitizer] Undef _TIME_BITS along with _FILE_OFFSET_BITS on linux
ClosedPublic

Authored by raj.khem on Dec 31 2022, 3:14 PM.

Details

Reviewers
thesamesam
MaskRay
Commits
rG26800a2c7e79: [sanitizer] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux
Summary

On 32-bit glibc>=2.34 systems using 64bit time_t build fails because
_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64

Fixes

/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed
 only with _FILE_OFFSET_BITS=64"
| #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
|     ^
| 1 error generated.

Diff Detail

Event Timeline

raj.khem created this revision.Dec 31 2022, 3:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 31 2022, 3:14 PM
Herald added subscribers: Enna1, dberris. · View Herald Transcript
raj.khem requested review of this revision.Dec 31 2022, 3:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 31 2022, 3:14 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B205295: Diff 485789.Dec 31 2022, 3:34 PM
thesamesam accepted this revision.Jan 7 2023, 12:36 AM
This revision is now accepted and ready to land.Jan 7 2023, 12:36 AM
thesamesam added a reviewer: MaskRay.Jan 23 2023, 11:27 PM
MaskRay accepted this revision.Feb 3 2023, 11:44 AM
MaskRay edited the summary of this revision. (Show Details)

Thanks!

MaskRay edited the summary of this revision. (Show Details)Feb 3 2023, 11:46 AM

Changed the description a bit that this is for glibc>=2.34

MaskRay retitled this revision from compiler-rt: Undef _TIME_BITS along with _FILE_OFFSET_BITS on linux to [sanitizer] Undef _TIME_BITS along with _FILE_OFFSET_BITS on linux.Feb 3 2023, 11:48 AM
This revision was landed with ongoing or failed builds.Feb 3 2023, 11:48 AM
Closed by commit rG26800a2c7e79: [sanitizer] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux (authored by raj.khem, committed by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rG26800a2c7e79: [sanitizer] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux.

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
1 line

Diff 494698

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Show All 12 Lines
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
// Tests in this file assume that off_t-dependent data structures match the // Tests in this file assume that off_t-dependent data structures match the
// libc ABI. For example, struct dirent here is what readdir() function (as // libc ABI. For example, struct dirent here is what readdir() function (as
// exported from libc) returns, and not the user-facing "dirent", which // exported from libc) returns, and not the user-facing "dirent", which
// depends on _FILE_OFFSET_BITS setting. // depends on _FILE_OFFSET_BITS setting.
// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
#undef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS
#undef _TIME_BITS
#endif #endif
// Must go after undef _FILE_OFFSET_BITS. // Must go after undef _FILE_OFFSET_BITS.
#include "sanitizer_platform.h" #include "sanitizer_platform.h"
#if SANITIZER_LINUX || SANITIZER_APPLE #if SANITIZER_LINUX || SANITIZER_APPLE
// Must go after undef _FILE_OFFSET_BITS. // Must go after undef _FILE_OFFSET_BITS.
#include "sanitizer_glibc_version.h" #include "sanitizer_glibc_version.h"
▲ Show 20 Lines • Show All 1,317 Lines • Show Last 20 Lines