7 files changed, 42 insertions, 28 deletions
diff --git a/linuxthreads/sysdeps/alpha/tls.h b/linuxthreads/sysdeps/alpha/tls.h
index 261e67dd0f..261d333eb4 100644
--- a/linuxthreads/sysdeps/alpha/tls.h
+++ b/linuxthreads/sysdeps/alpha/tls.h
@@ -114,12 +114,14 @@ typedef struct
    the compiler does its job and unifies the multiple
    __builtin_thread_pointer instances.  */
 
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 # endif	/* HAVE_TLS_SUPPORT */
 #endif /* __ASSEMBLER__ */
diff --git a/linuxthreads/sysdeps/ia64/pt-machine.h b/linuxthreads/sysdeps/ia64/pt-machine.h
index 6efe66966d..c4383125e5 100644
--- a/linuxthreads/sysdeps/ia64/pt-machine.h
+++ b/linuxthreads/sysdeps/ia64/pt-machine.h
@@ -64,12 +64,14 @@ register struct _pthread_descr_struct *__thread_self __asm__("r13");
 
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 
 /* Memory barrier */
diff --git a/linuxthreads/sysdeps/s390/s390-32/pt-machine.h b/linuxthreads/sysdeps/s390/s390-32/pt-machine.h
index c3a8110084..e95922dc14 100644
--- a/linuxthreads/sysdeps/s390/s390-32/pt-machine.h
+++ b/linuxthreads/sysdeps/s390/s390-32/pt-machine.h
@@ -80,12 +80,14 @@ register char * stack_pointer __asm__ ("15");
 #endif
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 /* We want the OS to assign stack addresses.  */
 #define FLOATING_STACKS 1
diff --git a/linuxthreads/sysdeps/s390/s390-64/pt-machine.h b/linuxthreads/sysdeps/s390/s390-64/pt-machine.h
index 5cab958cfa..eaa5abb6bf 100644
--- a/linuxthreads/sysdeps/s390/s390-64/pt-machine.h
+++ b/linuxthreads/sysdeps/s390/s390-64/pt-machine.h
@@ -86,12 +86,14 @@ register char * stack_pointer __asm__ ("15");
 #endif
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 /* We want the OS to assign stack addresses.  */
 #define FLOATING_STACKS 1
diff --git a/linuxthreads/sysdeps/sh/pt-machine.h b/linuxthreads/sysdeps/sh/pt-machine.h
index c7fcc694b1..68dd310594 100644
--- a/linuxthreads/sysdeps/sh/pt-machine.h
+++ b/linuxthreads/sysdeps/sh/pt-machine.h
@@ -68,12 +68,14 @@ struct _pthread_descr_struct;
   ({ __asm__ __volatile__("ldc %0,gbr" : : "r" (descr));})
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #endif /* __ASSEMBLER__ */
 
 #endif /* pt-machine.h */
diff --git a/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h b/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h
index 404edf2b95..f60d806d83 100644
--- a/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h
+++ b/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h
@@ -65,12 +65,14 @@ register struct _pthread_descr_struct *__thread_self __asm__("%g7");
 #define INIT_THREAD_SELF(descr, nr)  (__thread_self = (descr))
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 /* We want the OS to assign stack addresses.  */
 #define FLOATING_STACKS 1
diff --git a/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h b/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
index 291a73291c..0d8a7027e8 100644
--- a/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
+++ b/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
@@ -87,12 +87,14 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
 }
 
 /* Access to data in the thread descriptor is easy.  */
-#define THREAD_GETMEM(descr, member) (sizeof (descr), THREAD_SELF->member)
-#define THREAD_GETMEM_NC(descr, member) (sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
+#define THREAD_GETMEM_NC(descr, member) \
+  ((void) sizeof (descr), THREAD_SELF->member)
 #define THREAD_SETMEM(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 #define THREAD_SETMEM_NC(descr, member, value) \
-  (sizeof (descr), THREAD_SELF->member = (value))
+  ((void) sizeof (descr), THREAD_SELF->member = (value))
 
 /* We want the OS to assign stack addresses.  */
 #define FLOATING_STACKS 1