Skip to content

[NFC][sanitizer] Move ThreadDescriptorSize into GLIBC/FREEBSD block #108913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 17, 2024
Merged

[NFC][sanitizer] Move ThreadDescriptorSize into GLIBC/FREEBSD block #108913

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f704c1f
[𝘀𝗽𝗿] changes to main this commit is based on
vitalybuka Sep 17, 2024
a082836
[𝘀𝗽𝗿] initial version
vitalybuka Sep 17, 2024
8808bb7
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 17, 2024
6a71219
rebase
vitalybuka Sep 17, 2024
db9c0ec
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 17, 2024
9111ba2
rebase
vitalybuka Sep 17, 2024
c95d977
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 17, 2024
540a82c
rebase
vitalybuka Sep 17, 2024
df4976d
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 17, 2024
ba58480
rebase
vitalybuka Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ void InitTlsSize() {}
// On glibc x86_64, ThreadDescriptorSize() needs to be precise due to the usage
// of g_tls_size. On other targets, ThreadDescriptorSize() is only used by lsan
// to get the pointer to thread-specific data keys in the thread control block.
# if (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_SOLARIS) && \
!SANITIZER_ANDROID && !SANITIZER_GO
# if (SANITIZER_FREEBSD || SANITIZER_GLIBC) && !SANITIZER_GO
// sizeof(struct pthread) from glibc.
static atomic_uintptr_t thread_descriptor_size;

// FIXME: Implementation is very GLIBC specific, but it's used by FREEBSD.
static uptr ThreadDescriptorSizeFallback() {
# if defined(__x86_64__) || defined(__i386__) || defined(__arm__)
int major;
Expand Down Expand Up @@ -363,6 +363,10 @@ static uptr TlsPreTcbSize() {
}
# endif

# endif

# if (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_SOLARIS) && \
!SANITIZER_ANDROID && !SANITIZER_GO
namespace {
struct TlsBlock {
uptr begin, end, align;
Expand Down
Loading