deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
new file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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