From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 2 Jan 2011 19:14:41 +0000 (+0100)
Subject: m68k: force alignment of sem_t
X-Git-Tag: glibc-2.16-ports-before-merge~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9524dbd1f3f91a9b381bb0e17dc5e150fe8be75a;p=thirdparty%2Fglibc.git

m68k: force alignment of sem_t
---

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index ccd8b4e60c0..feba28e20d7 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2011-01-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (sem_t):
+	Force alignment.
+
 2010-12-26  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/m68k/stackinfo.h (DEFAULT_STACK_PERMS): Define.
diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
index 2950cc9a700..baaa9eb25f9 100644
--- a/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
+++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
@@ -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@codesourcery.com>, 2010.
 
@@ -32,5 +32,5 @@
 typedef union
 {
   char __size[__SIZEOF_SEM_T];
-  long int __align;
+  long int __align __attribute__ ((aligned (4)));
 } sem_t;