[commits] r12755 - in /branches/eglibc-2_12/ports: ChangeLog.m68k sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Feb  4 14:33:25 2011
New Revision: 12755

Log:
Merge changes between r12322 and r12754 from /fsf/glibc-2_12-branch.

Modified:
    branches/eglibc-2_12/ports/ChangeLog.m68k
    branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h

Modified: branches/eglibc-2_12/ports/ChangeLog.m68k
==============================================================================
--- branches/eglibc-2_12/ports/ChangeLog.m68k (original)
+++ branches/eglibc-2_12/ports/ChangeLog.m68k Fri Feb  4 14:33:25 2011
@@ -1,3 +1,8 @@
+2011-01-10  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (sem_t):
+	Force alignment.
+
 2010-08-25  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h

Modified: branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
==============================================================================
--- branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (original)
+++ branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h Fri Feb  4 14:33:25 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>, 2010.
 
@@ -32,5 +32,5 @@
 typedef union
 {
   char __size[__SIZEOF_SEM_T];
-  long int __align;
+  long int __align __attribute__ ((__aligned__ (4)));
 } sem_t;