2008-06-09  Jakub Jelinek  <jakub@redhat.com>

	* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.

diff -Naur gcc-4.4.0.orig/libgomp/omp.h.in gcc-4.4.0/libgomp/omp.h.in
--- gcc-4.4.0.orig/libgomp/omp.h.in	2009-04-09 16:23:07.000000000 -0700
+++ gcc-4.4.0/libgomp/omp.h.in	2009-06-15 13:55:33.000000000 -0700
@@ -39,8 +39,8 @@
 
 typedef struct
 {
-  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
-    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
+  unsigned char _x[8 + sizeof (void *)] 
+    __attribute__((__aligned__(sizeof (void *))));
 } omp_nest_lock_t;
 #endif