diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-09 12:07:06 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-09 12:07:06 +0000 |
| commit | 7e94af39f99027d2b3c4b2c3d8e902a79c264db3 (patch) | |
| tree | 9edbe29a4f48c26a197d073aad4688c98fc66a82 /libsanitizer | |
| parent | 18700cbbfa7b2c0a8a21947b01fae1748bbdcae2 (diff) | |
Merge branches/gcc-7-branch rev 265943.
Change-Id: I26d1099385c6c64150e153f8f6f304d161b5dac1
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 a127bb0c2d6..8eab49f00b4 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-06-22 Jakub Jelinek <jakub@redhat.com> Backported from mainline diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc index dc342de6e10..7c94a5fc615 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc @@ -236,7 +236,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); |