* descr.h (struct pthread): Add final member `end_padding'.

	(PTHREAD_STRUCT_END_PADDING): Use it.

2006-02-20  Roland McGrath  <roland@redhat.com>

	* sysdeps/mips: Directory removed, saved in ports repository.
	* sysdeps/unix/sysv/linux/mips: Likewise.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 654579027c9f27739f2b712b3ce669804cb77a62..30357d61990bf6e9a2c0c84df1b1125e82479f69 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-23  Roland McGrath  <roland@redhat.com>
+
+       * descr.h (struct pthread): Add final member `end_padding'.
+       (PTHREAD_STRUCT_END_PADDING): Use it.
+
+2006-02-20  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/mips: Directory removed, saved in ports repository.
+       * sysdeps/unix/sysv/linux/mips: Likewise.
+
 2006-02-18  Ulrich Drepper  <drepper@redhat.com>
 
        * tst-robust1.c: Add second mutex to check that the mutex list is

diff --git a/nptl/descr.h b/nptl/descr.h
index d5491c13558f86b696b6cd1bee8b23e11a4e97d3..80251b920bba153aa65b0adcb91cc57ab4655079 100644 (file)
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -305,12 +305,11 @@ struct pthread
   /* Resolver state.  */
   struct __res_state res;
 
-  /* If you add fields after the res field above, please adjust
-     the following macro.  */
-#define PTHREAD_STRUCT_END_PADDING \
-  (sizeof (struct pthread) - offsetof (struct pthread, res) \
-   - sizeof (((struct pthread *) 0)->res))
+  /* This member must be last.  */
+  char end_padding[];
 
+#define PTHREAD_STRUCT_END_PADDING \
+  (sizeof (struct pthread) - offsetof (struct pthread, end_padding))
 } __attribute ((aligned (TCB_ALIGNMENT)));