musl - musl - an implementation of the standard library for Linux-based systems

index : musl
musl - an implementation of the standard library for Linux-based systems
summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014年03月11日 15:27:13 -0400
committerRich Felker <dalias@aerifal.cx>2014年03月11日 15:27:13 -0400
commitf6e2f7e13f0edb1bb1d94e6ad4bf44abffd048d1 (patch)
tree03255e64909707df47a7221b01a81eedd84544d0
parent6739b13a172aad9c01572c04cadacc99c7041811 (diff)
downloadmusl-f6e2f7e13f0edb1bb1d94e6ad4bf44abffd048d1.tar.gz
move struct semid_ds to from shared sys/sem.h to bits
the definition was found to be incorrect at least for powerpc, and fixing this cleanly requires making the definition arch-specific. this will allow cleaning up the definition for other archs to make it more specific, and reversing some of the ugliness (time_t hacks) introduced with the x32 port. this first commit simply copies the existing definition to each arch without any changes. this is intentional, to make it easier to review changes made on a per-arch basis.
Diffstat
-rw-r--r--arch/arm/bits/sem.h 16
-rw-r--r--arch/i386/bits/sem.h 16
-rw-r--r--arch/microblaze/bits/sem.h 16
-rw-r--r--arch/mips/bits/sem.h 16
-rw-r--r--arch/powerpc/bits/sem.h 16
-rw-r--r--arch/sh/bits/sem.h 16
-rw-r--r--arch/x32/bits/sem.h 16
-rw-r--r--arch/x86_64/bits/sem.h 16
-rw-r--r--include/sys/sem.h 17
9 files changed, 129 insertions, 16 deletions
diff --git a/arch/arm/bits/sem.h b/arch/arm/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/arm/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/i386/bits/sem.h b/arch/i386/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/i386/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/microblaze/bits/sem.h b/arch/microblaze/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/microblaze/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/mips/bits/sem.h b/arch/mips/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/mips/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/powerpc/bits/sem.h b/arch/powerpc/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/powerpc/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/sh/bits/sem.h b/arch/sh/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/sh/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/x32/bits/sem.h b/arch/x32/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/x32/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/arch/x86_64/bits/sem.h b/arch/x86_64/bits/sem.h
new file mode 100644
index 00000000..c629b81e
--- /dev/null
+++ b/arch/x86_64/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+ struct ipc_perm sem_perm;
+ time_t sem_otime;
+ time_t __unused1;
+ time_t sem_ctime;
+ time_t __unused2;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned short sem_nsems;
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+#else
+ char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
+ unsigned short sem_nsems;
+#endif
+ time_t __unused3;
+ time_t __unused4;
+};
diff --git a/include/sys/sem.h b/include/sys/sem.h
index 6ee3dd5a..e7c36980 100644
--- a/include/sys/sem.h
+++ b/include/sys/sem.h
@@ -27,22 +27,7 @@ extern "C" {
#include <endian.h>
-struct semid_ds {
- struct ipc_perm sem_perm;
- time_t sem_otime;
- time_t __unused1;
- time_t sem_ctime;
- time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
- unsigned short sem_nsems;
- char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
- char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
- unsigned short sem_nsems;
-#endif
- time_t __unused3;
- time_t __unused4;
-};
+#include <bits/sem.h>
#define _SEM_SEMUN_UNDEFINED 1
generated by cgit v1.2.1 (git 2.18.0) at 2025年09月07日 13:54:37 +0000

AltStyle によって変換されたページ (->オリジナル) /