Merge "Merge remote-tracking branch 'aosp/master' into HEAD" into master-soong

2015-03-17 19:31:43 +00:00
parent 7357ad0875 270f2ea800
commit 51b8912253
1 changed files with 1 additions and 1 deletions
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -78,7 +78,7 @@ typedef struct {
 #else
  char __private[4];
 #endif
-} pthread_cond_t __attribute__((aligned(8)));
+} pthread_cond_t __attribute__((aligned(sizeof(long))));

 #define PTHREAD_COND_INITIALIZER  { { 0 } }