<div dir="ltr">I support merging this change into 3.8 if it's not too late in the release process.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Feb 17, 2016 at 11:19 PM, Hahnfeld, Jonas via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi all,<br>
<br>
I think this would be another candidate to go into 3.8...<br>
<br>
Sorry for those last-minute fixes,<br>
Jonas<br>
<div class="HOEnZb"><div class="h5"><br>
> -----Original Message-----<br>
> From: llvm-commits [mailto:<a href="mailto:llvm-commits-bounces@lists.llvm.org">llvm-commits-bounces@lists.llvm.org</a>] On Behalf<br>
> Of Jonas Hahnfeld via llvm-commits<br>
> Sent: Thursday, February 18, 2016 8:08 AM<br>
> To: <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> Subject: [compiler-rt] r261193 - [compiler-rt] Return correct size of struct<br>
> pthread for glibc-2.12.2<br>
><br>
> Author: hahnfeld<br>
> Date: Thu Feb 18 01:08:26 2016<br>
> New Revision: 261193<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261193&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261193&view=rev</a><br>
> Log:<br>
> [compiler-rt] Return correct size of struct pthread for glibc-2.12.2<br>
><br>
> There seems to be a difference between 2.12.1 and 2.12.2 in 64-bit build.<br>
> Tested on Scientific Linux 6.6, based on RHEL.<br>
><br>
> Differential Revision: <a href="http://reviews.llvm.org/D17190" rel="noreferrer" target="_blank">http://reviews.llvm.org/D17190</a><br>
><br>
> Modified:<br>
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc<br>
><br>
> Modified: compiler-<br>
> rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-</a><br>
> rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc?rev=261193&r1=2<br>
> 61192&r2=261193&view=diff<br>
> ==========================================================<br>
> ====================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc<br>
> (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc Thu<br>
> Feb 18 01:08:26 2016<br>
> @@ -222,6 +222,11 @@ uptr ThreadDescriptorSize() {<br>
>      char *end;<br>
>      int minor = internal_simple_strtoll(buf + 8, &end, 10);<br>
>      if (end != buf + 8 && (*end == '\0' || *end == '.')) {<br>
> +      int patch = 0;<br>
> +      if (*end == '.')<br>
> +        // strtoll will return 0 if no valid conversion could be performed<br>
> +        patch = internal_simple_strtoll(end + 1, nullptr, 10);<br>
> +<br>
>        /* sizeof(struct pthread) values from various glibc versions.  */<br>
>        if (SANITIZER_X32)<br>
>          val = 1728;  // Assume only one particular version for x32.<br>
> @@ -235,9 +240,9 @@ uptr ThreadDescriptorSize() {<br>
>          val = FIRST_32_SECOND_64(1136, 1712);<br>
>        else if (minor == 10)<br>
>          val = FIRST_32_SECOND_64(1168, 1776);<br>
> -      else if (minor <= 12)<br>
> +      else if (minor == 11 || (minor == 12 && patch == 1))<br>
>          val = FIRST_32_SECOND_64(1168, 2288);<br>
> -      else if (minor == 13)<br>
> +      else if (minor <= 13)<br>
>          val = FIRST_32_SECOND_64(1168, 2304);<br>
>        else<br>
>          val = FIRST_32_SECOND_64(1216, 2304);<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</div></div><br>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>