summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog67
-rw-r--r--Makeconfig13
-rw-r--r--sysdeps/unix/sysv/linux/sigaction.c18
3 files changed, 55 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e009d0b88..1cffcdfb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,34 +1,39 @@
-1998-10-12 Philip Blundell <pb@nexus.co.uk>
-
- * Makeconfig (sysdep-subdirs): Allow Subdirs files to remove
- directories as well as add them.
-
-1998-10-28 Philip Blundell <pb@nexus.co.uk>
-
- * sysdeps/unix/sysv/linux/neteconet/ec.h: New file. Support for
- AF_ECONET sockets as found in recent Linux 2.1 kernels.
- * sysdeps/unix/sysv/linux/Dist: Distribute it.
- * sysdeps/unix/sysv/linux/Makefile: Install it.
-
-1998-10-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
-
- * string/bits/string2.h: __USE_GNU already implies __USE_MISC.
-
-1998-10-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
-
- * sysdeps/generic/bits/types.h (__FDS_BITS): New macro to access
- fds_bits member.
- * sysdeps/unix/sysv/linux/alpha/bits/types.h (__FDS_BITS): Likewise.
- * sysdeps/unix/sysv/linux/bits/types.h (__FDS_BITS): Likewise.
- * sysdeps/unix/sysv/linux/mips/bits/types.h (__FDS_BITS): Likewise.
- * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__FDS_BITS):
- Likewise.
- * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h (__FDS_BITS):
- Likewise.
- * sysdeps/generic/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR,
- __FD_ISSET): Use it.
- * sysdeps/i386/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR,
- __FD_ISSET): Likewise.
+1998-10-29 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/sigaction.c (__sigaction): Allow
+ compiling on systems without rt_sigaction syscall.
+
+1998-10-12 Philip Blundell <pb@nexus.co.uk>
+
+ * Makeconfig (sysdep-subdirs): Allow Subdirs files to remove
+ directories as well as add them.
+
+1998-10-28 Philip Blundell <pb@nexus.co.uk>
+
+ * sysdeps/unix/sysv/linux/neteconet/ec.h: New file. Support for
+ AF_ECONET sockets as found in recent Linux 2.1 kernels.
+ * sysdeps/unix/sysv/linux/Dist: Distribute it.
+ * sysdeps/unix/sysv/linux/Makefile: Install it.
+
+1998-10-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+
+ * string/bits/string2.h: __USE_GNU already implies __USE_MISC.
+
+1998-10-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+
+ * sysdeps/generic/bits/types.h (__FDS_BITS): New macro to access
+ fds_bits member.
+ * sysdeps/unix/sysv/linux/alpha/bits/types.h (__FDS_BITS): Likewise.
+ * sysdeps/unix/sysv/linux/bits/types.h (__FDS_BITS): Likewise.
+ * sysdeps/unix/sysv/linux/mips/bits/types.h (__FDS_BITS): Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__FDS_BITS):
+ Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h (__FDS_BITS):
+ Likewise.
+ * sysdeps/generic/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR,
+ __FD_ISSET): Use it.
+ * sysdeps/i386/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR,
+ __FD_ISSET): Likewise.
1998-10-28 Geoff Keating <geoffk@ozemail.com.au>
diff --git a/Makeconfig b/Makeconfig
index 237f48f4df..8e5129f2fb 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -747,6 +747,7 @@ define \n
endef
sysdep-subdirs := $(subst $(\n), ,$(sysdep-subdirs))
+sysdep-inhibit-subdirs := $(subst $(\n), ,$(sysdep-inhibit-subdirs))
endif
# These are the subdirectories containing the library source.
@@ -756,6 +757,7 @@ all-subdirs = csu assert ctype db db2 locale intl catgets math setjmp signal\
gnulib iconv iconvdata wctype manual shadow md5-crypt po argp \
$(add-ons) nss localedata timezone rt debug $(sysdep-subdirs) \
$(binfmt-subdir)
+all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs))
subdirs = $(all-subdirs)
# The mach and hurd subdirectories have many generated header files which
@@ -769,10 +771,13 @@ subdirs := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
all-Subdirs-files = $(wildcard $(config-sysdirs:%=$(..)%/Subdirs))
$(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files)
- (echo define sysdep-subdirs; \
- sed 's/#.*$$//' $(all-Subdirs-files) /dev/null; \
- echo endef; \
- echo 'sysd-dirs-done = t'; \
+ (echo define sysdep-subdirs; \
+ sed 's/[#-].*$$//' $(all-Subdirs-files) /dev/null; \
+ echo endef; \
+ echo define sysdep-inhibit-subdirs; \
+ sed '/-.*$$/!d;s/^-//' $(all-Subdirs-files) /dev/null; \
+ echo endef; \
+ echo 'sysd-dirs-done = t'; \
) > $@-tmp
mv -f $@-tmp $@
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c
index 72cead81d2..1c0fa9e439 100644
--- a/sysdeps/unix/sysv/linux/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sigaction.c
@@ -49,6 +49,7 @@ __sigaction (sig, act, oact)
struct old_kernel_sigaction k_sigact, k_osigact;
int result;
+#ifdef __NR_rt_sigaction
/* First try the RT signals. */
if (!__libc_missing_rt_sigs)
{
@@ -60,15 +61,15 @@ __sigaction (sig, act, oact)
kact.k_sa_handler = act->sa_handler;
memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
kact.sa_flags = act->sa_flags;
-#ifdef HAVE_SA_RESTORER
+# ifdef HAVE_SA_RESTORER
kact.sa_restorer = act->sa_restorer;
-#endif
+# endif
}
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
- result = INLINE_SYSCALL (rt_sigaction, 4, sig, act ? &kact : 0,
- oact ? &koact : 0, _NSIG / 8);
+ result = INLINE_SYSCALL (rt_sigaction, 4, sig, act ? &kact : NULL,
+ oact ? &koact : NULL, _NSIG / 8);
if (result >= 0 || errno != ENOSYS)
{
@@ -77,9 +78,9 @@ __sigaction (sig, act, oact)
oact->sa_handler = koact.k_sa_handler;
memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
oact->sa_flags = koact.sa_flags;
-#ifdef HAVE_SA_RESTORER
+# ifdef HAVE_SA_RESTORER
oact->sa_restorer = koact.sa_restorer;
-#endif
+# endif
}
return result;
}
@@ -87,6 +88,7 @@ __sigaction (sig, act, oact)
__set_errno (saved_errno);
__libc_missing_rt_sigs = 1;
}
+#endif
if (act)
{
@@ -97,8 +99,8 @@ __sigaction (sig, act, oact)
k_sigact.sa_restorer = act->sa_restorer;
#endif
}
- result = INLINE_SYSCALL (sigaction, 3, sig, act ? &k_sigact : 0,
- oact ? &k_osigact : 0);
+ result = INLINE_SYSCALL (sigaction, 3, sig, act ? &k_sigact : NULL,
+ oact ? &k_osigact : NULL);
if (oact && result >= 0)
{
oact->sa_handler = k_osigact.k_sa_handler;