GNU C Library master sources branch master updated. glibc-2.25-781-g55703fc

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  55703fcace89b53d7f41f7d85ede50571da2bcc8 (commit)
      from  2a28610f9ff05484130b71dfd525f031c4066166 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=55703fcace89b53d7f41f7d85ede50571da2bcc8

commit 55703fcace89b53d7f41f7d85ede50571da2bcc8
Author: Andreas Schwab <schwab@suse.de>
Date:   Mon Jul 24 11:06:19 2017 +0200

    Remove extra semicolons in struct pthread_mutex (bug 21804)

diff --git a/ChangeLog b/ChangeLog
index b0be632..6f1fb54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-07-24  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #21804]
+	* sysdeps/nptl/bits/thread-shared-types.h (__PTHREAD_SPINS_DATA)
+	[__PTHREAD_MUTEX_LOCK_ELISION && __WORDSIZE == 64]: Remove
+	trailing semicolon.
+	(struct __pthread_mutex_s): Remove semicolon after
+	__PTHREAD_COMPAT_PADDING_MID and __PTHREAD_COMPAT_PADDING_END.
+	* sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+	(__PTHREAD_COMPAT_PADDING_MID, __PTHREAD_COMPAT_PADDING_END): Add
+	semicolon.
+
 2017-07-23  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* sysdeps/unix/sysv/linux/s390/sys/ptrace.h [_LINUX_PTRACE_H ||
diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
index 7befe5d..c158562 100644
--- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
@@ -43,10 +43,10 @@
 /* The old 4-word 16-byte aligned lock. This is initalized
    to all ones by the Linuxthreads PTHREAD_MUTEX_INITIALIZER.
    Unused in NPTL.  */
-#define __PTHREAD_COMPAT_PADDING_MID  int __compat_padding[4]
+#define __PTHREAD_COMPAT_PADDING_MID  int __compat_padding[4];
 /* Two more words are left before the NPTL
    pthread_mutex_t is larger than Linuxthreads.  */
-#define __PTHREAD_COMPAT_PADDING_END  int __reserved[2]
+#define __PTHREAD_COMPAT_PADDING_END  int __reserved[2];
 #define __PTHREAD_MUTEX_LOCK_ELISION    0
 
 #define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16)))
diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
index 1e45f2d..68b82b6 100644
--- a/sysdeps/nptl/bits/thread-shared-types.h
+++ b/sysdeps/nptl/bits/thread-shared-types.h
@@ -77,7 +77,7 @@ typedef struct __pthread_internal_slist
 # if __WORDSIZE == 64
 #  define __PTHREAD_SPINS_DATA	\
   short __spins;		\
-  short __elision;
+  short __elision
 #  define __PTHREAD_SPINS             0, 0
 # else
 #  define __PTHREAD_SPINS_DATA	\
@@ -107,7 +107,7 @@ struct __pthread_mutex_s
   /* KIND must stay at this position in the structure to maintain
      binary compatibility with static initializers.  */
   int __kind;
-  __PTHREAD_COMPAT_PADDING_MID;
+  __PTHREAD_COMPAT_PADDING_MID
 #if __WORDSIZE == 64
   __PTHREAD_SPINS_DATA;
   __pthread_list_t __list;
@@ -120,7 +120,7 @@ struct __pthread_mutex_s
     __pthread_slist_t __list;
   };
 #endif
-  __PTHREAD_COMPAT_PADDING_END;
+  __PTHREAD_COMPAT_PADDING_END
 };
 
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                  |   12 ++++++++++++
 sysdeps/hppa/nptl/bits/pthreadtypes-arch.h |    4 ++--
 sysdeps/nptl/bits/thread-shared-types.h    |    6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources