From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 29 Jul 2019 22:17:43 +0000 (-0400)
Subject: remove duplicates of new generic bits/sem.h
X-Git-Tag: v1.1.24~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de5e56ce1626882dddfd5a7a900c0723af02d6ab;p=musl

remove duplicates of new generic bits/sem.h

some of these were not exact duplicates, but had gratuitously
different naming for padding, or omitted the endian checks because the
arch is fixed-endian.
---

diff --git a/arch/aarch64/bits/sem.h b/arch/aarch64/bits/sem.h
deleted file mode 100644
index 5184eb59..00000000
--- a/arch/aarch64/bits/sem.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	long __unused3;
-	long __unused4;
-};
diff --git a/arch/mips64/bits/sem.h b/arch/mips64/bits/sem.h
deleted file mode 100644
index 5184eb59..00000000
--- a/arch/mips64/bits/sem.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	long __unused3;
-	long __unused4;
-};
diff --git a/arch/powerpc64/bits/sem.h b/arch/powerpc64/bits/sem.h
deleted file mode 100644
index 558184db..00000000
--- a/arch/powerpc64/bits/sem.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <endian.h>
-
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-#if __BYTE_ORDER == __BIG_ENDIAN
-	unsigned short __pad[3], sem_nsems;
-#else
-	unsigned short sem_nsems, __pad[3];
-#endif
-	unsigned long __unused[2];
-};
diff --git a/arch/riscv64/bits/sem.h b/arch/riscv64/bits/sem.h
deleted file mode 100644
index 7b434413..00000000
--- a/arch/riscv64/bits/sem.h
+++ /dev/null
@@ -1,9 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-	long __unused3;
-	long __unused4;
-};
diff --git a/arch/s390x/bits/sem.h b/arch/s390x/bits/sem.h
deleted file mode 100644
index 644f68a0..00000000
--- a/arch/s390x/bits/sem.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-	unsigned short __pad[3], sem_nsems;
-	unsigned long __unused[2];
-};