This is an archive of the discontinued LLVM Phabricator instance.

Differential D50131

Fix sizeof(struct pthread) in glibc 2.14.
ClosedPublic

Authored by marxin on Aug 1 2018, 12:43 AM.

Details

Reviewers
kcc
Commits
rG3ab9eb5378eb: Merging r338606: --------------------------------------------------------------…
rGa8d7bcdd71c3: Fix sizeof(struct pthread) in glibc 2.14.
rL338691: Merging r338606:
rL338606: Fix sizeof(struct pthread) in glibc 2.14.
rCRT338606: Fix sizeof(struct pthread) in glibc 2.14.
Summary

Fixes: https://github.com/google/sanitizers/issues/966

Diff Detail

Event Timeline

marxin created this revision.Aug 1 2018, 12:43 AM
Herald added a subscriber: kubamracek. · View Herald TranscriptAug 1 2018, 12:43 AM
kcc accepted this revision.Aug 1 2018, 11:29 AM

LGTM, will land shortly

This revision is now accepted and ready to land.Aug 1 2018, 11:29 AM
Closed by commit rCRT338606: Fix sizeof(struct pthread) in glibc 2.14. (authored by kcc). · Explain WhyAug 1 2018, 11:30 AM
This revision was automatically updated to reflect the committed changes.
Herald added subscribers: Restricted Project, llvm-commits. · View Herald TranscriptAug 1 2018, 11:30 AM

Revision Contents

PathSize
lib/
sanitizer_common/
2 lines

Diff 158585

lib/sanitizer_common/sanitizer_linux_libcdep.cc

Show First 20 Lines • Show All 286 Lines • ▼ Show 20 Lines if (GetLibcVersion(&major, &minor, &patch) && major == 2) {
else if (minor == 5) else if (minor == 5)
val = FIRST_32_SECOND_64(1136, 1728); val = FIRST_32_SECOND_64(1136, 1728);
else if (minor <= 9) else if (minor <= 9)
val = FIRST_32_SECOND_64(1136, 1712); val = FIRST_32_SECOND_64(1136, 1712);
else if (minor == 10) else if (minor == 10)
val = FIRST_32_SECOND_64(1168, 1776); val = FIRST_32_SECOND_64(1168, 1776);
else if (minor == 11 || (minor == 12 && patch == 1)) else if (minor == 11 || (minor == 12 && patch == 1))
val = FIRST_32_SECOND_64(1168, 2288); val = FIRST_32_SECOND_64(1168, 2288);
else if (minor <= 13) else if (minor <= 14)
val = FIRST_32_SECOND_64(1168, 2304); val = FIRST_32_SECOND_64(1168, 2304);
else else
val = FIRST_32_SECOND_64(1216, 2304); val = FIRST_32_SECOND_64(1216, 2304);
} }
#elif defined(__mips__) #elif defined(__mips__)
// TODO(sagarthakur): add more values as per different glibc versions. // TODO(sagarthakur): add more values as per different glibc versions.
val = FIRST_32_SECOND_64(1152, 1776); val = FIRST_32_SECOND_64(1152, 1776);
#elif defined(__aarch64__) #elif defined(__aarch64__)
▲ Show 20 Lines • Show All 508 Lines • Show Last 20 Lines