3 files changed, 11 insertions, 10 deletions
diff --git a/libpthread/nptl/pthread_key_create.c b/libpthread/nptl/pthread_key_create.c
index 6e11bbeae..87999764e 100644
--- a/libpthread/nptl/pthread_key_create.c
+++ b/libpthread/nptl/pthread_key_create.c
@@ -22,7 +22,6 @@
 
 
 int
-attribute_protected
 __pthread_key_create (
      pthread_key_t *key,
      void (*destr) (void *))
diff --git a/libpthread/nptl/sysdeps/nds32/dl-tls.h b/libpthread/nptl/sysdeps/nds32/dl-tls.h
index f0107cacb..11101fdd2 100644
--- a/libpthread/nptl/sysdeps/nds32/dl-tls.h
+++ b/libpthread/nptl/sysdeps/nds32/dl-tls.h
@@ -56,4 +56,6 @@ extern void *_dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset);
 extern ptrdiff_t attribute_hidden
   _dl_tlsdesc_dynamic(struct tlsdesc *);
 
+#define TLS_DTV_UNALLOCATED ((void *) -1l)
+
 #endif //_NDS32_DL_TLS_H
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h b/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
index 2a90a0b90..d2f22caee 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/m68k/bits/pthreadtypes.h
@@ -39,7 +39,7 @@ typedef unsigned long int pthread_t;
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_ATTR_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_attr_t;
 
 
@@ -69,13 +69,13 @@ typedef union
     };
   } __data;
   char __size[__SIZEOF_PTHREAD_MUTEX_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_mutex_t;
 
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_mutexattr_t;
 
 
@@ -95,13 +95,13 @@ typedef union
     unsigned int __broadcast_seq;
   } __data;
   char __size[__SIZEOF_PTHREAD_COND_T];
-  __extension__ long long int __align;
+  __extension__ long long int __align __attribute__((__aligned__(8)));
 } pthread_cond_t;
 
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_CONDATTR_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_condattr_t;
 
 
@@ -144,13 +144,13 @@ typedef union
     int __writer;
   } __data;
   char __size[__SIZEOF_PTHREAD_RWLOCK_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_rwlock_t;
 
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_RWLOCKATTR_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_rwlockattr_t;
 #endif
 
@@ -165,13 +165,13 @@ typedef volatile int pthread_spinlock_t;
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_BARRIER_T];
-  long int __align;
+  long int __align __attribute__((__aligned__(4)));
 } pthread_barrier_t;
 
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_BARRIERATTR_T];
-  int __align;
+  int __align __attribute__((__aligned__(4)));
 } pthread_barrierattr_t;
 #endif