<div dir="ltr">Thanks! <div>Committed as r199090.</div><div><br></div><div>--kcc </div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jan 10, 2014 at 2:02 PM, 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">On Thu, Jan 09, 2014 at 03:11:16PM -0800, Chandler Carruth wrote:<br>
> I've mailed out a patch to the LLVM developer's policy which should clarify<br>
> this. The only thing that would help is for the authors of these three<br>
> patches (and the fourth patch I found later) to just email a copy of the<br>
> patch to llvm-commits, or if any of you have commit access to directly<br>
> commit the patch.<br>
<br>
Ok, I'm doing this now for the ppc32 sanitizer_common fix, originally posted<br>
in <a href="http://gcc.gnu.org/ml/gcc-patches/2013-12/msg00209.html" target="_blank">http://gcc.gnu.org/ml/gcc-patches/2013-12/msg00209.html</a> with all the<br>
explanations there.<br>
<br>
--- lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
@@ -142,23 +142,32 @@ namespace __sanitizer {<br>
int gid;<br>
int cuid;<br>
int cgid;<br>
-#ifdef __powerpc64__<br>
+#ifdef __powerpc__<br>
unsigned mode;<br>
unsigned __seq;<br>
+ u64 __unused1;<br>
+ u64 __unused2;<br>
#else<br>
unsigned short mode;<br>
unsigned short __pad1;<br>
unsigned short __seq;<br>
unsigned short __pad2;<br>
+#if defined(__x86_64__) && !defined(_LP64)<br>
+ u64 __unused1;<br>
+ u64 __unused2;<br>
+#else<br>
+ unsigned long __unused1;<br>
+ unsigned long __unused2;<br>
+#endif<br>
#endif<br>
- uptr __unused1;<br>
- uptr __unused2;<br>
};<br>
<br>
struct __sanitizer_shmid_ds {<br>
__sanitizer_ipc_perm shm_perm;<br>
#ifndef __powerpc__<br>
uptr shm_segsz;<br>
+ #elif !defined(__powerpc64__)<br>
+ uptr __unused0;<br>
#endif<br>
uptr shm_atime;<br>
#ifndef _LP64<br>
@@ -290,17 +299,20 @@ namespace __sanitizer {<br>
typedef long __sanitizer_clock_t;<br>
<br>
#if SANITIZER_LINUX<br>
-#if defined(_LP64) || defined(__x86_64__)<br>
+#if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__)<br>
typedef unsigned __sanitizer___kernel_uid_t;<br>
typedef unsigned __sanitizer___kernel_gid_t;<br>
- typedef long long __sanitizer___kernel_off_t;<br>
#else<br>
typedef unsigned short __sanitizer___kernel_uid_t;<br>
typedef unsigned short __sanitizer___kernel_gid_t;<br>
+#endif<br>
+#if defined(__x86_64__) && !defined(_LP64)<br>
+ typedef long long __sanitizer___kernel_off_t;<br>
+#else<br>
typedef long __sanitizer___kernel_off_t;<br>
#endif<br>
<br>
-#if defined(__powerpc64__)<br>
+#if defined(__powerpc__)<br>
typedef unsigned int __sanitizer___kernel_old_uid_t;<br>
typedef unsigned int __sanitizer___kernel_old_gid_t;<br>
#else<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>