[klibc] [PATCH] use RT signals by default

Thorsten Glaser tg at mirbsd.org
Fri May 18 10:25:24 PDT 2012


error out if __NR_sigaction is defined and _KLIBC_USE_RT_SIG is
not set; default to _KLIBC_USE_RT_SIG=1 otherwise

This sets _KLIBC_USE_RT_SIG=0 on cris (untested whether RT signals
are usable or not, to keep current status quo) and the known-bad
m68k and s390, removing _KLIBC_USE_RT_SIG=1 from all other headers.
Those untouched do not have __NR_sigaction defined and so have been
using RT signals from the beginning.

Signed-off-by: Thorsten Glaser <tg at mirbsd.org>
---
 usr/include/arch/alpha/klibc/archconfig.h   |    1 -
 usr/include/arch/arm/klibc/archconfig.h     |    3 ---
 usr/include/arch/cris/klibc/archconfig.h    |    3 +++
 usr/include/arch/m68k/klibc/archconfig.h    |    3 +++
 usr/include/arch/mips/klibc/archconfig.h    |    3 ---
 usr/include/arch/mips64/klibc/archconfig.h  |    3 ---
 usr/include/arch/ppc/klibc/archconfig.h     |    2 +-
 usr/include/arch/ppc64/klibc/archconfig.h   |    2 +-
 usr/include/arch/s390/klibc/archconfig.h    |    3 +++
 usr/include/arch/sh/klibc/archconfig.h      |    3 +--
 usr/include/arch/sparc/klibc/archconfig.h   |    1 -
 usr/include/arch/sparc64/klibc/archconfig.h |    1 -
 usr/include/klibc/sysconfig.h               |    2 +-
 13 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/usr/include/arch/alpha/klibc/archconfig.h b/usr/include/arch/alpha/klibc/archconfig.h
index 272fee0..06dd73d 100644
--- a/usr/include/arch/alpha/klibc/archconfig.h
+++ b/usr/include/arch/alpha/klibc/archconfig.h
@@ -9,7 +9,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-#define _KLIBC_USE_RT_SIG 1
 #define _KLIBC_STATFS_F_TYPE_64 0
 
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/arm/klibc/archconfig.h b/usr/include/arch/arm/klibc/archconfig.h
index cfe847a..36e9ab5 100644
--- a/usr/include/arch/arm/klibc/archconfig.h
+++ b/usr/include/arch/arm/klibc/archconfig.h
@@ -15,7 +15,4 @@
 # define _KLIBC_ARM_USE_BX 1
 #endif
 
-/* Use rt_* signals */
-#define _KLIBC_USE_RT_SIG 1
-
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/cris/klibc/archconfig.h b/usr/include/arch/cris/klibc/archconfig.h
index 0206078..03287bd 100644
--- a/usr/include/arch/cris/klibc/archconfig.h
+++ b/usr/include/arch/cris/klibc/archconfig.h
@@ -12,4 +12,7 @@
 /* cris uses 13 as the page shift factor for sys_mmap2 */
 #define _KLIBC_MMAP2_SHIFT	13
 
+/* RT signals are still untested here */
+#define _KLIBC_USE_RT_SIG 0
+
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/m68k/klibc/archconfig.h b/usr/include/arch/m68k/klibc/archconfig.h
index 10ef62e..d34025d 100644
--- a/usr/include/arch/m68k/klibc/archconfig.h
+++ b/usr/include/arch/m68k/klibc/archconfig.h
@@ -12,4 +12,7 @@
 /* On m68k, sys_mmap2 uses the current page size as the shift factor */
 #define _KLIBC_MMAP2_SHIFT	__getpageshift()
 
+/* RT signals are still unusable here */
+#define _KLIBC_USE_RT_SIG 0
+
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/mips/klibc/archconfig.h b/usr/include/arch/mips/klibc/archconfig.h
index 9c21efc..ff0afb5 100644
--- a/usr/include/arch/mips/klibc/archconfig.h
+++ b/usr/include/arch/mips/klibc/archconfig.h
@@ -18,7 +18,4 @@
 /* MIPS has nonstandard socket definitions */
 #define _KLIBC_HAS_ARCHSOCKET_H 1
 
-/* We can use RT signals on MIPS */
-#define _KLIBC_USE_RT_SIG 1
-
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/mips64/klibc/archconfig.h b/usr/include/arch/mips64/klibc/archconfig.h
index 4d856a5..9071cb4 100644
--- a/usr/include/arch/mips64/klibc/archconfig.h
+++ b/usr/include/arch/mips64/klibc/archconfig.h
@@ -12,7 +12,4 @@
 /* MIPS has nonstandard socket definitions */
 #define _KLIBC_HAS_ARCHSOCKET_H 1
 
-/* We can use RT signals on MIPS */
-#define _KLIBC_USE_RT_SIG 1
-
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/ppc/klibc/archconfig.h b/usr/include/arch/ppc/klibc/archconfig.h
index 61c3657..ce04eee 100644
--- a/usr/include/arch/ppc/klibc/archconfig.h
+++ b/usr/include/arch/ppc/klibc/archconfig.h
@@ -9,6 +9,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-#define _KLIBC_USE_RT_SIG 1
+/* All defaults */
 
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/ppc64/klibc/archconfig.h b/usr/include/arch/ppc64/klibc/archconfig.h
index 27c5630..a6a0d6b 100644
--- a/usr/include/arch/ppc64/klibc/archconfig.h
+++ b/usr/include/arch/ppc64/klibc/archconfig.h
@@ -7,6 +7,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-#define _KLIBC_USE_RT_SIG 1
+/* All defaults */
 
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/s390/klibc/archconfig.h b/usr/include/arch/s390/klibc/archconfig.h
index d7a71a4..a3906d6 100644
--- a/usr/include/arch/s390/klibc/archconfig.h
+++ b/usr/include/arch/s390/klibc/archconfig.h
@@ -12,4 +12,7 @@
 /* Both s390 and s390x use the "32-bit" version of this structure */
 #define _KLIBC_STATFS_F_TYPE_64 0
 
+/* RT signals are still unusable here */
+#define _KLIBC_USE_RT_SIG 0
+
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/sh/klibc/archconfig.h b/usr/include/arch/sh/klibc/archconfig.h
index 923c563..9c9e3d8 100644
--- a/usr/include/arch/sh/klibc/archconfig.h
+++ b/usr/include/arch/sh/klibc/archconfig.h
@@ -9,7 +9,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-/* Use rt_* signals */
-#define _KLIBC_USE_RT_SIG 1
+/* All defaults */
 
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/sparc/klibc/archconfig.h b/usr/include/arch/sparc/klibc/archconfig.h
index 70d5ef0..a920876 100644
--- a/usr/include/arch/sparc/klibc/archconfig.h
+++ b/usr/include/arch/sparc/klibc/archconfig.h
@@ -9,7 +9,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-#define _KLIBC_USE_RT_SIG 1	/* Use rt_* signals */
 #define _KLIBC_SYS_SOCKETCALL 1 /* Use sys_socketcall unconditionally */
 
 #endif				/* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/sparc64/klibc/archconfig.h b/usr/include/arch/sparc64/klibc/archconfig.h
index 794d15b..df5c806 100644
--- a/usr/include/arch/sparc64/klibc/archconfig.h
+++ b/usr/include/arch/sparc64/klibc/archconfig.h
@@ -9,7 +9,6 @@
 #ifndef _KLIBC_ARCHCONFIG_H
 #define _KLIBC_ARCHCONFIG_H
 
-#define _KLIBC_USE_RT_SIG 1	/* Use rt_* signals */
 #define _KLIBC_NEEDS_SA_RESTORER 1 /* Need a restorer function */
 #define _KLIBC_SYS_SOCKETCALL 1 /* Use sys_socketcall unconditionally */
 
diff --git a/usr/include/klibc/sysconfig.h b/usr/include/klibc/sysconfig.h
index 5fa9b60..e864aa4 100644
--- a/usr/include/klibc/sysconfig.h
+++ b/usr/include/klibc/sysconfig.h
@@ -142,7 +142,7 @@
  */
 #ifndef _KLIBC_USE_RT_SIG
 # ifdef __NR_sigaction
-#  define _KLIBC_USE_RT_SIG 0
+#  error If you really want non-RT signals, select them explicitly.
 # else
 #  define _KLIBC_USE_RT_SIG 1
 # endif
-- 
1.7.10



More information about the klibc mailing list