shithub: scc

Info  •  Files  •  Log  •  Branches

libc: Fix build in bsd systems

After the commit 383f380a the other BSD systems didn't compile
because the new sigaction.h file was not present on them.
This commit uses the same header that the one used in
OpenBSD that should work but it could not be tested correctly.
At least the compilation is fixed again.

diff: cannot open b/include/bits/netbsd/amd64/arch//null: file does not exist: 'b/include/bits/netbsd/amd64/arch//null'

--- /dev/null

+++ b/include/bits/darwin/amd64/arch/sigaction.h

@@ -1,0 +1,15 @@

+typedef unsigned int sigset_t;

+typedef struct siginfo siginfo_t;

+

+struct sigaction {

+	union {

+		void (*__sa_handler)(int);

+		void (*__sa_sigaction)(int, siginfo_t *, void *);

+	} __sigaction_u;

+

+	sigset_t sa_mask;

+	int sa_flags;

+};

+

+#define sa_handler      __sigaction_u.__sa_handler

+#define sa_sigaction    __sigaction_u.__sa_sigaction

--- a/include/bits/darwin/sys.h

+++ b/include/bits/darwin/sys.h

@@ -12,12 +12,6 @@

 typedef int pid_t;

-struct sigaction {

-	void (*sa_handler)(int);

-	int sa_mask;

-	int sa_flags;

-};

-

 extern pid_t _getpid(void);

-extern int _kill(pid_t pid, int signum);

-extern int _sigaction(int sig, struct sigaction *new, struct sigaction *old);

+extern int _kill(pid_t, int);

+extern int _sigaction(int, struct sigaction *, struct sigaction *);

--- /dev/null

+++ b/include/bits/dragonfly/amd64/arch/sigaction.h

@@ -1,0 +1,15 @@

+typedef unsigned int sigset_t;

+typedef struct siginfo siginfo_t;

+

+struct sigaction {

+	union {

+		void (*__sa_handler)(int);

+		void (*__sa_sigaction)(int, siginfo_t *, void *);

+	} __sigaction_u;

+

+	sigset_t sa_mask;

+	int sa_flags;

+};

+

+#define sa_handler      __sigaction_u.__sa_handler

+#define sa_sigaction    __sigaction_u.__sa_sigaction

--- a/include/bits/dragonfly/sys.h

+++ b/include/bits/dragonfly/sys.h

@@ -12,12 +12,6 @@

 typedef int pid_t;

-struct sigaction {

-	void (*sa_handler)(int);

-	char sa_mask[8];

-	int sa_flags;

-};

-

 extern pid_t _getpid(void);

-extern int _kill(pid_t pid, int signum);

-extern int _sigaction(int sig, struct sigaction *new, struct sigaction *old);

+extern int _kill(pid_t, int);

+extern int _sigaction(int, struct sigaction *, struct sigaction *);

--- /dev/null

+++ b/include/bits/netbsd/amd64/arch/sigaction.h

@@ -1,0 +1,15 @@

+typedef unsigned int sigset_t;

+typedef struct siginfo siginfo_t;

+

+struct sigaction {

+	union {

+		void (*__sa_handler)(int);

+		void (*__sa_sigaction)(int, siginfo_t *, void *);

+	} __sigaction_u;

+

+	sigset_t sa_mask;

+	int sa_flags;

+};

+

+#define sa_handler      __sigaction_u.__sa_handler

+#define sa_sigaction    __sigaction_u.__sa_sigaction

--- /dev/null

+++ b/include/bits/netbsd/amd64/arch/stdint.h

@@ -1,0 +1,115 @@

+#define INT8_MAX  0x7F

+#define INT8_MIN  (-INT8_MAX-1)

+#define UINT8_MAX 0xFF

+

+#define INT16_MAX  0x7FFF

+#define INT16_MIN  (-INT16_MAX-1)

+#define UINT16_MAX 0xFFFF

+

+#define INT32_MAX  0x7FFFFFFF

+#define INT32_MIN  (-INT32_MAX-1)

+#define UINT32_MAX 0xFFFFFFFF

+

+#define INT64_MAX  0x7FFFFFFFFFFFFFFF

+#define INT64_MIN  (-INT64_MAX-1)

+#define UINT64_MAX 0xFFFFFFFFFFFFFFFF

+

+#define INT_LEAST8_MIN  INT8_MIN

+#define INT_LEAST8_MAX  INT8_MAX

+#define UINT_LEAST8_MAX UINT8_MAX

+

+#define INT_LEAST16_MIN  INT32_MIN

+#define INT_LEAST16_MAX  INT32_MAX

+#define UINT_LEAST16_MAX UINT32_MAX

+

+#define INT_LEAST32_MIN  INT32_MIN

+#define INT_LEAST32_MAX  INT32_MAX

+#define UINT_LEAST32_MAX UINT32_MAX

+

+#define INT_LEAST64_MIN  INT64_MIN

+#define INT_LEAST64_MAX  INT64_MAX

+#define UINT_LEAST64_MAX UINT64_MAX

+

+#define INT_FAST8_MIN  INT32_MIN

+#define INT_FAST8_MAX  INT32_MAX

+#define UINT_FAST8_MAX UINT32_MAX

+

+#define INT_FAST16_MIN  INT32_MIN

+#define INT_FAST16_MAX  INT32_MAX

+#define UINT_FAST16_MAX UINT32_MAX

+

+#define INT_FAST32_MIN  INT32_MIN

+#define INT_FAST32_MAX  INT32_MAX

+#define UINT_FAST32_MAX UINT32_MAX

+

+#define INT_FAST64_MIN  INT64_MIN

+#define INT_FAST64_MAX  INT64_MAX

+#define UINT_FAST64_MAX UINT64_MAX

+

+#define INTPTR_MIN  INT64_MIN

+#define INTPTR_MAX  INT64_MAX

+#define UINTPTR_MAX UINT64_MAX

+

+#define INTMAX_MIN  INT64_MIN

+#define INTMAX_MAX  INT64_MAX

+#define UINTMAX_MAX UINT64_MAX

+

+#define PTRDIFF_MIN INT64_MIN

+#define PTRDIFF_MAX INT64_MAX

+

+#define SIG_ATOMIC_MIN INT32_MIN

+#define SIG_ATOMIC_MAX INT32_MAX

+

+#define SIZE_MAX UINT64_MAX

+

+#define WCHAR_MIN INT32_MIN

+#define WCHAR_MAX INT32_MAX

+

+#define INT8_C(x)  x

+#define INT16_C(x) x

+#define INT32_C(x) x

+#define INT64_C(x) x ## LL

+

+#define UINT8_C(x)  x

+#define UINT16_C(x) x

+#define UINT32_C(x) x ## U

+#define UINT64_C(x) x ## ULL

+

+#define INTMAX_C(x)  x ## LL

+#define UINTMAX_C(x) x ## ULL

+

+typedef signed char int8_t;

+typedef short int16_t;

+typedef int int32_t;

+typedef long int64_t;

+

+typedef unsigned char uint8_t;

+typedef unsigned short uint16_t;

+typedef unsigned uint32_t;

+typedef unsigned long uint64_t;

+

+typedef signed char int_least8_t;

+typedef short int_least16_t;

+typedef int int_least32_t;

+typedef long int_least64_t;

+

+typedef unsigned char uint_least8_t;

+typedef unsigned short uint_least16_t;

+typedef unsigned uint_least32_t;

+typedef unsigned long uint_least64_t;

+

+typedef int int_fast8_t;

+typedef int int_fast16_t;

+typedef int int_fast32_t;

+typedef int int_fast64_t;

+

+typedef unsigned uint_fast8_t;

+typedef unsigned uint_fast16_t;

+typedef unsigned uint_fast32_t;

+typedef unsigned long uint_fast64_t;

+

+typedef long intptr_t;

+typedef unsigned long uintptr_t;

+

+typedef long intmax_t;

+typedef unsigned long uintmax_t;

--- /dev/null

+++ b/include/bits/netbsd/amd64/arch/time.h

@@ -1,0 +1,5 @@

+#define _MAXYEAR 9999

+

+typedef long time_t;

+typedef long clock_t;

+typedef long __suseconds_t;

--- a/include/bits/netbsd/amd64/stdint.h

+++ /dev/null

@@ -1,115 +1,0 @@

-#define INT8_MAX  0x7F

-#define INT8_MIN  (-INT8_MAX-1)

-#define UINT8_MAX 0xFF

-

-#define INT16_MAX  0x7FFF

-#define INT16_MIN  (-INT16_MAX-1)

-#define UINT16_MAX 0xFFFF

-

-#define INT32_MAX  0x7FFFFFFF

-#define INT32_MIN  (-INT32_MAX-1)

-#define UINT32_MAX 0xFFFFFFFF

-

-#define INT64_MAX  0x7FFFFFFFFFFFFFFF

-#define INT64_MIN  (-INT64_MAX-1)

-#define UINT64_MAX 0xFFFFFFFFFFFFFFFF

-

-#define INT_LEAST8_MIN  INT8_MIN

-#define INT_LEAST8_MAX  INT8_MAX

-#define UINT_LEAST8_MAX UINT8_MAX

-

-#define INT_LEAST16_MIN  INT32_MIN

-#define INT_LEAST16_MAX  INT32_MAX

-#define UINT_LEAST16_MAX UINT32_MAX

-

-#define INT_LEAST32_MIN  INT32_MIN

-#define INT_LEAST32_MAX  INT32_MAX

-#define UINT_LEAST32_MAX UINT32_MAX

-

-#define INT_LEAST64_MIN  INT64_MIN

-#define INT_LEAST64_MAX  INT64_MAX

-#define UINT_LEAST64_MAX UINT64_MAX

-

-#define INT_FAST8_MIN  INT32_MIN

-#define INT_FAST8_MAX  INT32_MAX

-#define UINT_FAST8_MAX UINT32_MAX

-

-#define INT_FAST16_MIN  INT32_MIN

-#define INT_FAST16_MAX  INT32_MAX

-#define UINT_FAST16_MAX UINT32_MAX

-

-#define INT_FAST32_MIN  INT32_MIN

-#define INT_FAST32_MAX  INT32_MAX

-#define UINT_FAST32_MAX UINT32_MAX

-

-#define INT_FAST64_MIN  INT64_MIN

-#define INT_FAST64_MAX  INT64_MAX

-#define UINT_FAST64_MAX UINT64_MAX

-

-#define INTPTR_MIN  INT64_MIN

-#define INTPTR_MAX  INT64_MAX

-#define UINTPTR_MAX UINT64_MAX

-

-#define INTMAX_MIN  INT64_MIN

-#define INTMAX_MAX  INT64_MAX

-#define UINTMAX_MAX UINT64_MAX

-

-#define PTRDIFF_MIN INT64_MIN

-#define PTRDIFF_MAX INT64_MAX

-

-#define SIG_ATOMIC_MIN INT32_MIN

-#define SIG_ATOMIC_MAX INT32_MAX

-

-#define SIZE_MAX UINT64_MAX

-

-#define WCHAR_MIN INT32_MIN

-#define WCHAR_MAX INT32_MAX

-

-#define INT8_C(x)  x

-#define INT16_C(x) x

-#define INT32_C(x) x

-#define INT64_C(x) x ## LL

-

-#define UINT8_C(x)  x

-#define UINT16_C(x) x

-#define UINT32_C(x) x ## U

-#define UINT64_C(x) x ## ULL

-

-#define INTMAX_C(x)  x ## LL

-#define UINTMAX_C(x) x ## ULL

-

-typedef signed char int8_t;

-typedef short int16_t;

-typedef int int32_t;

-typedef long int64_t;

-

-typedef unsigned char uint8_t;

-typedef unsigned short uint16_t;

-typedef unsigned uint32_t;

-typedef unsigned long uint64_t;

-

-typedef signed char int_least8_t;

-typedef short int_least16_t;

-typedef int int_least32_t;

-typedef long int_least64_t;

-

-typedef unsigned char uint_least8_t;

-typedef unsigned short uint_least16_t;

-typedef unsigned uint_least32_t;

-typedef unsigned long uint_least64_t;

-

-typedef int int_fast8_t;

-typedef int int_fast16_t;

-typedef int int_fast32_t;

-typedef int int_fast64_t;

-

-typedef unsigned uint_fast8_t;

-typedef unsigned uint_fast16_t;

-typedef unsigned uint_fast32_t;

-typedef unsigned long uint_fast64_t;

-

-typedef long intptr_t;

-typedef unsigned long uintptr_t;

-

-typedef long intmax_t;

-typedef unsigned long uintmax_t;

--- a/include/bits/netbsd/amd64/time.h

+++ /dev/null

@@ -1,5 +1,0 @@

-#define _MAXYEAR 9999

-

-typedef long time_t;

-typedef long clock_t;

-typedef long __suseconds_t;

--- a/include/bits/netbsd/sys.h

+++ b/include/bits/netbsd/sys.h

@@ -12,12 +12,6 @@

 typedef int pid_t;

-struct sigaction {

-	void (*sa_handler)(int);

-	char sa_mask[8];

-	int sa_flags;

-};

-

 extern pid_t _getpid(void);

-extern int _kill(pid_t pid, int signum);

-extern int _sigaction(int sig, struct sigaction *new, struct sigaction *old);

+extern int _kill(pid_t, int);

+extern int _sigaction(int, struct sigaction *, struct sigaction *);

--- a/include/bits/openbsd/sys.h

+++ b/include/bits/openbsd/sys.h

@@ -15,5 +15,5 @@

 struct sigaction;

 extern pid_t _getpid(void);

-extern int _kill(pid_t pid, int signum);

-extern int _sigaction(int sig, struct sigaction *new, struct sigaction *old);

+extern int _kill(pid_t, int);

+extern int _sigaction(int, struct sigaction *, struct sigaction *);