[commits] r12529 - in /fsf/glibc-2_12-branch/ports: ChangeLog.m68k sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jan 11 00:05:44 2011
New Revision: 12529

Log:
Import glibc-ports-2.12 for 2011-01-11

Modified:
    fsf/glibc-2_12-branch/ports/ChangeLog.m68k
    fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h

Modified: fsf/glibc-2_12-branch/ports/ChangeLog.m68k
==============================================================================
--- fsf/glibc-2_12-branch/ports/ChangeLog.m68k (original)
+++ fsf/glibc-2_12-branch/ports/ChangeLog.m68k Tue Jan 11 00:05:44 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: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h Tue Jan 11 00:05:44 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;