* [review] nptl: Add default pthread-offsets.h
@ 2019-11-07 14:24 Adhemerval Zanella (Code Review)
2019-11-08 19:43 ` [review v2] " Adhemerval Zanella (Code Review)
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Adhemerval Zanella (Code Review) @ 2019-11-07 14:24 UTC (permalink / raw)
To: libc-alpha
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
nptl: Add default pthread-offsets.h
This patch adds a default pthread-offsets.h based on default
thread definitions from mutex-internal.h and rwlock-internal.h.
The idea is to simpify new ports inclusion.
Checked with a build on affected abis.
Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
---
D sysdeps/aarch64/nptl/pthread-offsets.h
D sysdeps/alpha/nptl/pthread-offsets.h
D sysdeps/arm/nptl/pthread-offsets.h
D sysdeps/csky/nptl/pthread-offsets.h
D sysdeps/ia64/nptl/pthread-offsets.h
D sysdeps/m68k/nptl/pthread-offsets.h
D sysdeps/microblaze/nptl/pthread-offsets.h
D sysdeps/nios2/nptl/pthread-offsets.h
A sysdeps/nptl/pthread-offsets.h
D sysdeps/riscv/nptl/pthread-offsets.h
D sysdeps/sh/nptl/pthread-offsets.h
D sysdeps/sparc/nptl/pthread-offsets.h
12 files changed, 39 insertions(+), 197 deletions(-)
diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h
deleted file mode 100644
index 679cec5..0000000
--- a/sysdeps/aarch64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 12
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 24
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 28
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h
deleted file mode 100644
index 679cec5..0000000
--- a/sysdeps/alpha/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 12
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 24
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 28
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h
deleted file mode 100644
index cc2a939..0000000
--- a/sysdeps/arm/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#if __BYTE_ORDER == __BIG_ENDIAN
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 26
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
-#else
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 25
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
-#endif
diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h
deleted file mode 100644
index a0eea7a..0000000
--- a/sysdeps/csky/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 25
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h
deleted file mode 100644
index 679cec5..0000000
--- a/sysdeps/ia64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 12
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 24
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 28
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h
deleted file mode 100644
index 14d66ac..0000000
--- a/sysdeps/m68k/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 26
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h
deleted file mode 100644
index cc2a939..0000000
--- a/sysdeps/microblaze/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#if __BYTE_ORDER == __BIG_ENDIAN
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 26
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
-#else
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 25
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
-#endif
diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h
deleted file mode 100644
index a0eea7a..0000000
--- a/sysdeps/nios2/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 25
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h
new file mode 100644
index 0000000..eb87d51
--- /dev/null
+++ b/sysdeps/nptl/pthread-offsets.h
@@ -0,0 +1,39 @@
+#include <bits/wordsize.h>
+
+/* These values are based on internal generic types from
+ mutex-internal.h and rwlock-internal.h. */
+
+#if __WORDSIZE == 64
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 12
+# define __PTHREAD_MUTEX_KIND_OFFSET 16
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 24
+#else
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 16
+# define __PTHREAD_MUTEX_KIND_OFFSET 12
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 20
+#endif
+
+#if __WORDSIZE == 64
+# define __PTHREAD_RWLOCK_READERS_OFFSET 0
+# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
+# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
+# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
+# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
+# define __PTHREAD_RWLOCK_SHARED_OFFSET 28
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
+#else
+# define __PTHREAD_RWLOCK_READERS_OFFSET 0
+# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
+# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
+# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
+# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_SHARED_OFFSET 26
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
+# else
+# define __PTHREAD_RWLOCK_SHARED_OFFSET 25
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
+# endif
+#endif
diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h
deleted file mode 100644
index f93af00..0000000
--- a/sysdeps/riscv/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RISC-V pthread offsets
- Copyright (C) 2017-2019 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 12
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 24
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
-#define __PTHREAD_RWLOCK_SHARED_OFFSET 28
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h
deleted file mode 100644
index cc2a939..0000000
--- a/sysdeps/sh/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-#define __PTHREAD_MUTEX_SPINS_OFFSET 20
-#define __PTHREAD_MUTEX_ELISION_OFFSET 22
-#define __PTHREAD_MUTEX_LIST_OFFSET 20
-
-#define __PTHREAD_RWLOCK_READERS_OFFSET 0
-#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-#if __BYTE_ORDER == __BIG_ENDIAN
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 26
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
-#else
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 25
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
-#endif
diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h
deleted file mode 100644
index a9ce40d..0000000
--- a/sysdeps/sparc/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 64
-# define __PTHREAD_MUTEX_NUSERS_OFFSET 12
-# define __PTHREAD_MUTEX_KIND_OFFSET 16
-# define __PTHREAD_MUTEX_SPINS_OFFSET 20
-# define __PTHREAD_MUTEX_ELISION_OFFSET 22
-# define __PTHREAD_MUTEX_LIST_OFFSET 24
-#else
-# define __PTHREAD_MUTEX_NUSERS_OFFSET 16
-# define __PTHREAD_MUTEX_KIND_OFFSET 12
-# define __PTHREAD_MUTEX_SPINS_OFFSET 20
-# define __PTHREAD_MUTEX_ELISION_OFFSET 22
-# define __PTHREAD_MUTEX_LIST_OFFSET 20
-#endif
-
-#if __WORDSIZE == 64
-# define __PTHREAD_RWLOCK_READERS_OFFSET 0
-# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 28
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
-#else
-# define __PTHREAD_RWLOCK_READERS_OFFSET 0
-# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4
-# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8
-# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12
-# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28
-# define __PTHREAD_RWLOCK_SHARED_OFFSET 26
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
-#endif
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 1
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-MessageType: newchange
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [review v2] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
@ 2019-11-08 19:43 ` Adhemerval Zanella (Code Review)
2019-11-14 11:31 ` Florian Weimer (Code Review)
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella (Code Review) @ 2019-11-08 19:43 UTC (permalink / raw)
To: libc-alpha
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
nptl: Add default pthread-offsets.h
This patch adds a default pthread-offsets.h based on default
thread definitions from mutex-internal.h and rwlock-internal.h.
The idea is to simpify new ports inclusion.
Checked with a build on affected abis.
Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
---
D sysdeps/aarch64/nptl/pthread-offsets.h
D sysdeps/alpha/nptl/pthread-offsets.h
D sysdeps/arm/nptl/pthread-offsets.h
D sysdeps/csky/nptl/pthread-offsets.h
D sysdeps/ia64/nptl/pthread-offsets.h
D sysdeps/m68k/nptl/pthread-offsets.h
D sysdeps/microblaze/nptl/pthread-offsets.h
D sysdeps/nios2/nptl/pthread-offsets.h
A sysdeps/nptl/pthread-offsets.h
D sysdeps/riscv/nptl/pthread-offsets.h
D sysdeps/sh/nptl/pthread-offsets.h
D sysdeps/sparc/nptl/pthread-offsets.h
12 files changed, 26 insertions(+), 74 deletions(-)
diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/aarch64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/alpha/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/arm/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/csky/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/ia64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h
deleted file mode 100644
index 4d6696a..0000000
--- a/sysdeps/m68k/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/microblaze/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/nios2/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h
new file mode 100644
index 0000000..a399608
--- /dev/null
+++ b/sysdeps/nptl/pthread-offsets.h
@@ -0,0 +1,26 @@
+#include <bits/wordsize.h>
+
+/* These values are based on internal generic types from
+ mutex-internal.h and rwlock-internal.h. */
+
+#if __WORDSIZE == 64
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 12
+# define __PTHREAD_MUTEX_KIND_OFFSET 16
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 24
+#else
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 16
+# define __PTHREAD_MUTEX_KIND_OFFSET 12
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 20
+#endif
+
+#if __WORDSIZE == 64
+# 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
diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h
deleted file mode 100644
index 4f14276..0000000
--- a/sysdeps/riscv/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* RISC-V pthread offsets
- Copyright (C) 2017-2019 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/sh/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h
deleted file mode 100644
index 9e21121..0000000
--- a/sysdeps/sparc/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 64
-# define __PTHREAD_MUTEX_KIND_OFFSET 16
-#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
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 2
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-MessageType: newpatchset
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [review v2] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
2019-11-08 19:43 ` [review v2] " Adhemerval Zanella (Code Review)
@ 2019-11-14 11:31 ` Florian Weimer (Code Review)
2019-11-20 14:49 ` Adhemerval Zanella (Code Review)
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Florian Weimer (Code Review) @ 2019-11-14 11:31 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha; +Cc: Florian Weimer
Florian Weimer has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
Patch Set 2:
(2 comments)
Looks okay, except for nits in the commit message.
| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,15 @@
| +Parent: dcffe302 (nptl: Add default pthreadtypes-arch.h)
| +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +AuthorDate: 2017-11-14 19:10:38 -0200
| +Commit: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +CommitDate: 2019-11-08 16:43:16 -0300
| +
| +nptl: Add default pthread-offsets.h
| +
| +This patch adds a default pthread-offsets.h based on default
| +thread definitions from mutex-internal.h and rwlock-internal.h.
PS2, Line 10:
Header names are outdated.
| +The idea is to simpify new ports inclusion.
PS2, Line 11:
simplify
| +
| +Checked with a build on affected abis.
| +
| +Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 2
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-CC: Florian Weimer <fweimer@redhat.com>
Gerrit-Comment-Date: Thu, 14 Nov 2019 11:31:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 7+ messages in thread
* [review v2] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
2019-11-08 19:43 ` [review v2] " Adhemerval Zanella (Code Review)
2019-11-14 11:31 ` Florian Weimer (Code Review)
@ 2019-11-20 14:49 ` Adhemerval Zanella (Code Review)
2019-11-20 14:51 ` [review v3] " Adhemerval Zanella (Code Review)
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella (Code Review) @ 2019-11-20 14:49 UTC (permalink / raw)
To: libc-alpha; +Cc: Florian Weimer
Adhemerval Zanella has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
Patch Set 2:
(2 comments)
| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,15 @@
| +Parent: dcffe302 (nptl: Add default pthreadtypes-arch.h)
| +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +AuthorDate: 2017-11-14 19:10:38 -0200
| +Commit: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +CommitDate: 2019-11-08 16:43:16 -0300
| +
| +nptl: Add default pthread-offsets.h
| +
| +This patch adds a default pthread-offsets.h based on default
| +thread definitions from mutex-internal.h and rwlock-internal.h.
PS2, Line 10:
Ack
| +The idea is to simpify new ports inclusion.
PS2, Line 11:
Ack
| +
| +Checked with a build on affected abis.
| +
| +Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 2
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-CC: Florian Weimer <fweimer@redhat.com>
Gerrit-Comment-Date: Wed, 20 Nov 2019 14:49:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Florian Weimer <fweimer@redhat.com>
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 7+ messages in thread
* [review v3] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
` (2 preceding siblings ...)
2019-11-20 14:49 ` Adhemerval Zanella (Code Review)
@ 2019-11-20 14:51 ` Adhemerval Zanella (Code Review)
2019-11-22 11:09 ` Florian Weimer (Code Review)
2019-11-26 14:20 ` [pushed] " Sourceware to Gerrit sync (Code Review)
5 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella (Code Review) @ 2019-11-20 14:51 UTC (permalink / raw)
To: libc-alpha; +Cc: Florian Weimer
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
nptl: Add default pthread-offsets.h
This patch adds a default pthread-offsets.h based on default
thread definitions from struct_mutex.h and struct_rwlock.h.
The idea is to simplify new ports inclusion.
Checked with a build on affected abis.
Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
---
D sysdeps/aarch64/nptl/pthread-offsets.h
D sysdeps/alpha/nptl/pthread-offsets.h
D sysdeps/arm/nptl/pthread-offsets.h
D sysdeps/csky/nptl/pthread-offsets.h
D sysdeps/ia64/nptl/pthread-offsets.h
D sysdeps/m68k/nptl/pthread-offsets.h
D sysdeps/microblaze/nptl/pthread-offsets.h
D sysdeps/nios2/nptl/pthread-offsets.h
A sysdeps/nptl/pthread-offsets.h
D sysdeps/riscv/nptl/pthread-offsets.h
D sysdeps/sh/nptl/pthread-offsets.h
D sysdeps/sparc/nptl/pthread-offsets.h
12 files changed, 26 insertions(+), 74 deletions(-)
diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/aarch64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/alpha/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/arm/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/csky/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/ia64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h
deleted file mode 100644
index 4d6696a..0000000
--- a/sysdeps/m68k/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/microblaze/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/nios2/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h
new file mode 100644
index 0000000..a399608
--- /dev/null
+++ b/sysdeps/nptl/pthread-offsets.h
@@ -0,0 +1,26 @@
+#include <bits/wordsize.h>
+
+/* These values are based on internal generic types from
+ mutex-internal.h and rwlock-internal.h. */
+
+#if __WORDSIZE == 64
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 12
+# define __PTHREAD_MUTEX_KIND_OFFSET 16
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 24
+#else
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 16
+# define __PTHREAD_MUTEX_KIND_OFFSET 12
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 20
+#endif
+
+#if __WORDSIZE == 64
+# 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
diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h
deleted file mode 100644
index 4f14276..0000000
--- a/sysdeps/riscv/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* RISC-V pthread offsets
- Copyright (C) 2017-2019 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/sh/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h
deleted file mode 100644
index 9e21121..0000000
--- a/sysdeps/sparc/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 64
-# define __PTHREAD_MUTEX_KIND_OFFSET 16
-#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
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 3
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-CC: Florian Weimer <fweimer@redhat.com>
Gerrit-MessageType: newpatchset
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [review v3] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
` (3 preceding siblings ...)
2019-11-20 14:51 ` [review v3] " Adhemerval Zanella (Code Review)
@ 2019-11-22 11:09 ` Florian Weimer (Code Review)
2019-11-26 14:20 ` [pushed] " Sourceware to Gerrit sync (Code Review)
5 siblings, 0 replies; 7+ messages in thread
From: Florian Weimer (Code Review) @ 2019-11-22 11:09 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha; +Cc: Florian Weimer
Florian Weimer has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
Patch Set 3: Code-Review+2
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 3
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Florian Weimer <fweimer@redhat.com>
Gerrit-Comment-Date: Fri, 22 Nov 2019 11:09:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pushed] nptl: Add default pthread-offsets.h
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
` (4 preceding siblings ...)
2019-11-22 11:09 ` Florian Weimer (Code Review)
@ 2019-11-26 14:20 ` Sourceware to Gerrit sync (Code Review)
5 siblings, 0 replies; 7+ messages in thread
From: Sourceware to Gerrit sync (Code Review) @ 2019-11-26 14:20 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha; +Cc: Florian Weimer
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/521
......................................................................
nptl: Add default pthread-offsets.h
This patch adds a default pthread-offsets.h based on default
thread definitions from struct_mutex.h and struct_rwlock.h.
The idea is to simplify new ports inclusion.
Checked with a build on affected abis.
Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
---
D sysdeps/aarch64/nptl/pthread-offsets.h
D sysdeps/alpha/nptl/pthread-offsets.h
D sysdeps/arm/nptl/pthread-offsets.h
D sysdeps/csky/nptl/pthread-offsets.h
D sysdeps/ia64/nptl/pthread-offsets.h
D sysdeps/m68k/nptl/pthread-offsets.h
D sysdeps/microblaze/nptl/pthread-offsets.h
D sysdeps/nios2/nptl/pthread-offsets.h
A sysdeps/nptl/pthread-offsets.h
D sysdeps/riscv/nptl/pthread-offsets.h
D sysdeps/sh/nptl/pthread-offsets.h
D sysdeps/sparc/nptl/pthread-offsets.h
12 files changed, 26 insertions(+), 74 deletions(-)
Approvals:
Florian Weimer: Looks good to me, approved
diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/aarch64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/alpha/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/arm/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/csky/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h
deleted file mode 100644
index 7fe06e0..0000000
--- a/sysdeps/ia64/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h
deleted file mode 100644
index 4d6696a..0000000
--- a/sysdeps/m68k/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27
diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/microblaze/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h
deleted file mode 100644
index 7940d1f..0000000
--- a/sysdeps/nios2/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __PTHREAD_MUTEX_KIND_OFFSET 12
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24
diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h
new file mode 100644
index 0000000..a399608
--- /dev/null
+++ b/sysdeps/nptl/pthread-offsets.h
@@ -0,0 +1,26 @@
+#include <bits/wordsize.h>
+
+/* These values are based on internal generic types from
+ mutex-internal.h and rwlock-internal.h. */
+
+#if __WORDSIZE == 64
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 12
+# define __PTHREAD_MUTEX_KIND_OFFSET 16
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 24
+#else
+# define __PTHREAD_MUTEX_NUSERS_OFFSET 16
+# define __PTHREAD_MUTEX_KIND_OFFSET 12
+# define __PTHREAD_MUTEX_SPINS_OFFSET 20
+# define __PTHREAD_MUTEX_LIST_OFFSET 20
+#endif
+
+#if __WORDSIZE == 64
+# 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
diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h
deleted file mode 100644
index 4f14276..0000000
--- a/sysdeps/riscv/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* RISC-V pthread offsets
- Copyright (C) 2017-2019 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#define __PTHREAD_MUTEX_KIND_OFFSET 16
-
-#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48
diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h
deleted file mode 100644
index e9accba..0000000
--- a/sysdeps/sh/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h
deleted file mode 100644
index 9e21121..0000000
--- a/sysdeps/sparc/nptl/pthread-offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 64
-# define __PTHREAD_MUTEX_KIND_OFFSET 16
-#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
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I7785a9581e651feb80d1413b9e03b5ac0452668a
Gerrit-Change-Number: 521
Gerrit-PatchSet: 5
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Florian Weimer <fweimer@redhat.com>
Gerrit-MessageType: merged
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-11-26 14:21 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07 14:24 [review] nptl: Add default pthread-offsets.h Adhemerval Zanella (Code Review)
2019-11-08 19:43 ` [review v2] " Adhemerval Zanella (Code Review)
2019-11-14 11:31 ` Florian Weimer (Code Review)
2019-11-20 14:49 ` Adhemerval Zanella (Code Review)
2019-11-20 14:51 ` [review v3] " Adhemerval Zanella (Code Review)
2019-11-22 11:09 ` Florian Weimer (Code Review)
2019-11-26 14:20 ` [pushed] " Sourceware to Gerrit sync (Code Review)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).