[pushed] nptl: Add tests for internal pthread_rwlock_t offsets
Commit Message
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/516
......................................................................
nptl: Add tests for internal pthread_rwlock_t offsets
This patch new build tests to check for internal fields offsets for
internal pthread_rwlock_t definition. Althoug the '__data.__flags'
field layout should be preserved due static initializators, the patch
also adds tests for the futexes that may be used in a shared memory
(although using different libc version in such scenario is not really
supported).
Checked with a build against all affected ABIs.
Change-Id: Iccc103d557de13d17e4a3f59a0cad2f4a640c148
---
M nptl/pthread_rwlock_init.c
M sysdeps/aarch64/nptl/pthread-offsets.h
M sysdeps/alpha/nptl/pthread-offsets.h
M sysdeps/arm/nptl/pthread-offsets.h
M sysdeps/csky/nptl/pthread-offsets.h
M sysdeps/hppa/nptl/pthread-offsets.h
M sysdeps/i386/nptl/pthread-offsets.h
M sysdeps/ia64/nptl/pthread-offsets.h
M sysdeps/m68k/nptl/pthread-offsets.h
M sysdeps/microblaze/nptl/pthread-offsets.h
M sysdeps/mips/nptl/pthread-offsets.h
M sysdeps/nios2/nptl/pthread-offsets.h
M sysdeps/powerpc/nptl/pthread-offsets.h
M sysdeps/riscv/nptl/pthread-offsets.h
M sysdeps/s390/nptl/pthread-offsets.h
M sysdeps/sh/nptl/pthread-offsets.h
M sysdeps/sparc/nptl/pthread-offsets.h
M sysdeps/x86_64/nptl/pthread-offsets.h
18 files changed, 78 insertions(+), 0 deletions(-)
Approvals:
Florian Weimer: Looks good to me, approved
@@ -18,6 +18,7 @@
#include "pthreadP.h"
#include <string.h>
+#include <pthread-offsets.h>
static const struct pthread_rwlockattr default_rwlockattr =
@@ -34,6 +35,13 @@
{
ASSERT_TYPE_SIZE (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T);
+ /* The __flags is the only field where its offset should be checked to
+ avoid ABI breakage with static initializers. */
+ ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_rwlock_t, __data.__flags,
+ __PTHREAD_RWLOCK_FLAGS_OFFSET);
+ ASSERT_PTHREAD_INTERNAL_MEMBER_SIZE (pthread_rwlock_t, __data.__flags,
+ int);
+
const struct pthread_rwlockattr *iattr;
iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_rwlockattr;
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 16
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 16
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
@@ -1 +1,7 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
+#endif
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 51
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 16
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
@@ -1 +1,7 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
+#endif
@@ -3,3 +3,13 @@
#else
# define __PTHREAD_MUTEX_KIND_OFFSET 12
#endif
+
+#if _MIPS_SIM == _ABI64
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#else
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+# else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
+# endif
+#endif
@@ -1 +1,3 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
@@ -5,3 +5,9 @@
#else
# define __PTHREAD_MUTEX_KIND_OFFSET 12
#endif
+
+#if __WORDSIZE == 64
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#endif
@@ -18,3 +18,5 @@
<https://www.gnu.org/licenses/>. */
#define __PTHREAD_MUTEX_KIND_OFFSET 16
+
+#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
@@ -5,3 +5,9 @@
#else
# define __PTHREAD_MUTEX_KIND_OFFSET 12
#endif
+
+#if __WORDSIZE == 64
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#endif
@@ -1 +1,7 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 12
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
+#endif
@@ -5,3 +5,9 @@
#else
# define __PTHREAD_MUTEX_KIND_OFFSET 12
#endif
+
+#if __WORDSIZE == 64
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+#endif
@@ -1 +1,7 @@
#define __PTHREAD_MUTEX_KIND_OFFSET 16
+
+#ifdef __ILP32__
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 40
+#else
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#endif