diff options
| author | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-08-16 10:16:17 +0000 |
|---|---|---|
| committer | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-08-16 10:16:17 +0000 |
| commit | 9680a6eaaf9e123e442d7fca50d59b8b0440221e (patch) | |
| tree | 0504f8d7b411bf4d46386b04d9f8ae55a19637ad /libsanitizer | |
| parent | 171222242f0e89331653e9ee3c5404617d1593aa (diff) | |
Backport r263246
2018-08-16 Martin Liska <mliska@suse.cz>
Backport from mainline
2018-08-02 Martin Liska <mliska@suse.cz>
PR sanitizer/86022
* sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize):
Cherry-pick compiler-rt revision 338606.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@263579 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 9 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index a1b1803e3a9..e4e62b339c5 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2018-08-16 Martin Liska <mliska@suse.cz> + + Backport from mainline + 2018-08-02 Martin Liska <mliska@suse.cz> + + PR sanitizer/86022 + * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize): + Cherry-pick compiler-rt revision 338606. + 2018-08-01 Marek Polacek <polacek@redhat.com> PR sanitizer/86759 diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc index d27a8435802..3b1a2174c46 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc @@ -235,7 +235,7 @@ uptr ThreadDescriptorSize() { val = FIRST_32_SECOND_64(1168, 1776); else if (minor == 11 || (minor == 12 && patch == 1)) val = FIRST_32_SECOND_64(1168, 2288); - else if (minor <= 13) + else if (minor <= 14) val = FIRST_32_SECOND_64(1168, 2304); else val = FIRST_32_SECOND_64(1216, 2304); |