This is an archive of the discontinued LLVM Phabricator instance.

Differential D124779

[Sanitizers] Fix compilation on musl 32bit
Needs RevisionPublic

Authored by vchuravy on May 2 2022, 9:24 AM.

Details

Reviewers
MaskRay
Summary

Without this compiling the santizers on i686-musl fail

Diff Detail

Event Timeline

vchuravy created this revision.May 2 2022, 9:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 2 2022, 9:24 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
vchuravy requested review of this revision.May 2 2022, 9:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 2 2022, 9:24 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B162264: Diff 426432.May 2 2022, 9:25 AM
vchuravy added a subscriber: Restricted Project.May 2 2022, 9:25 AM
MaskRay added inline comments.May 2 2022, 11:33 AM
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
481

!defined(__GLIBC__) will apply to *BSD systems.

You can use something like SANITIZER_LINUX && !SANITIZER_GLIBC.

Can you dig up the history a bit why glibc x86-64 needs to use this branch?
I'd expect that it uses the same for its other 64-bit ports.

MaskRay requested changes to this revision.May 21 2022, 2:47 PM
This revision now requires changes to proceed.May 21 2022, 2:47 PM

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
2 lines

Diff 426432

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Show First 20 Lines • Show All 472 Lines • ▼ Show 20 Lines
#if SANITIZER_MAC #if SANITIZER_MAC
struct __sanitizer_dirent { struct __sanitizer_dirent {
unsigned long long d_ino; unsigned long long d_ino;
unsigned long long d_seekoff; unsigned long long d_seekoff;
unsigned short d_reclen; unsigned short d_reclen;
// more fields that we don't care about // more fields that we don't care about
}; };
# elif SANITIZER_ANDROID || defined(__x86_64__) || defined(__hexagon__) # elif SANITIZER_ANDROID || defined(__x86_64__) || defined(__hexagon__) || !defined(__GLIBC__)
MaskRayUnsubmitted
Not Done
ReplyInline Actions

!defined(__GLIBC__) will apply to *BSD systems.

You can use something like SANITIZER_LINUX && !SANITIZER_GLIBC.

Can you dig up the history a bit why glibc x86-64 needs to use this branch?
I'd expect that it uses the same for its other 64-bit ports.

MaskRay: `!defined(__GLIBC__)` will apply to *BSD systems. You can use something like `SANITIZER_LINUX…
struct __sanitizer_dirent { struct __sanitizer_dirent {
unsigned long long d_ino; unsigned long long d_ino;
unsigned long long d_off; unsigned long long d_off;
unsigned short d_reclen; unsigned short d_reclen;
// more fields that we don't care about // more fields that we don't care about
}; };
# else # else
struct __sanitizer_dirent { struct __sanitizer_dirent {
▲ Show 20 Lines • Show All 970 Lines • Show Last 20 Lines