AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra semicolons in struct pthread_mutex (bug 21804)

Browse Source
This commit is contained in:
Andreas Schwab 2017-07-24 11:06:19 +02:00
parent 2a28610f9f
commit 55703fcace
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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 ||

4
sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
View File

@ -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)))

6
sysdeps/nptl/bits/thread-shared-types.h
View File

@ -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
};