klibc - Oct 2024 - [klibc:master] parisc: Fix build with Linux 6.10+

Commit-ID:  bea38362b46688a4e970856e1eee358540a40ee1
Gitweb:    
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=bea38362b46688a4e970856e1eee358540a40ee1
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Wed, 2 Oct 2024 01:21:22 +0200
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Wed, 2 Oct 2024 01:24:32 +0200

[klibc] parisc: Fix build with Linux 6.10+

The parisc version of <asm/signal.h> did not define _NSIG or struct
sigset until recently, so we did it in <klibc/archsignal.h>.

In Linux 6.10 and on some stable branches these definitions have been
added, conflicting with our definitions.  So make ours conditional on
!defined(_NSIG).

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 usr/include/arch/parisc/klibc/archsignal.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/include/arch/parisc/klibc/archsignal.h
b/usr/include/arch/parisc/klibc/archsignal.h
index 256aeea4..991e193c 100644
--- a/usr/include/arch/parisc/klibc/archsignal.h
+++ b/usr/include/arch/parisc/klibc/archsignal.h
@@ -9,6 +9,9 @@
 #define _KLIBC_ARCHSIGNAL_H
 
 #include <asm/signal.h>
+
+#ifndef _NSIG
+
 #define _NSIG    64
 #define _NSIG_SZ (_NSIG / LONG_BIT)
 
@@ -16,6 +19,8 @@ typedef struct {
 	unsigned long sig[_NSIG_SZ];
 } sigset_t;
 
+#endif /* _NSIG */
+
 struct sigaction {
 	__sighandler_t	sa_handler;
 	unsigned long	sa_flags;