<div dir="ltr">Thanks! <div>r226637</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 20, 2015 at 10:05 AM, Jakub Jelinek <span dir="ltr"><<a href="mailto:jakub@redhat.com" target="_blank">jakub@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi!<br>
<br>
glibc recently changed ABI on aarch64-linux:<br>
<a href="https://sourceware.org/git/?p=glibc.git;a=commit;h=5c40c3bab2fddaca8cfe12d75944d1fef8adf1a4" target="_blank">https://sourceware.org/git/?p=glibc.git;a=commit;h=5c40c3bab2fddaca8cfe12d75944d1fef8adf1a4</a><br>
Instead of having unsigned short mode; unsigned short __pad1; it now has<br>
unsigned int mode; field in ipc_perm structure.<br>
<br>
This patch allows to build against the recent glibc and disables the<br>
ipc_perm.mode verification for older versions of glibc.<br>
<br>
I think it shouldn't be a big deal even for older glibcs, I couldn't find<br>
any place which would actually care about the exact mode field, rather than<br>
the whole structure, appart from the CHECK_SIZE_AND_OFFSET macro.<br>
<br>
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h.jj       2014-10-14 15:11:22.170590985 +0200<br>
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h  2015-01-20 18:53:20.969780785 +0100<br>
@@ -169,7 +169,7 @@ namespace __sanitizer {<br>
     unsigned __seq;<br>
     u64 __unused1;<br>
     u64 __unused2;<br>
-#elif defined(__mips__)<br>
+#elif defined(__mips__) || defined(__aarch64__)<br>
     unsigned int mode;<br>
     unsigned short __seq;<br>
     unsigned short __pad1;<br>
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.jj      2014-12-15 19:50:53.597624368 +0100<br>
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2015-01-20 18:53:21.007780141 +0100<br>
@@ -1061,7 +1061,13 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);<br>
 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);<br>
 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);<br>
 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);<br>
+#ifndef __GLIBC_PREREQ<br>
+#define __GLIBC_PREREQ(x, y) 0<br>
+#endif<br>
+#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)<br>
+/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */<br>
 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);<br>
+#endif<br>
<br>
 CHECK_TYPE_SIZE(shmid_ds);<br>
 CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm);<br>
<br>
<br>
        Jakub<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>