[Glibc-bsd-commits] r1489 - trunk/glibc-2.3-head

[Petr Salinger]

Author: ps-guest
Date: 2006-04-25 19:15:04 +0000 (Tue, 25 Apr 2006)
New Revision: 1489

Modified:
   trunk/glibc-2.3-head/NOTES-2.4
   trunk/glibc-2.3-head/glibc24-extra-sysdeps.diff
Log:
post glibc 2.4 test


Modified: trunk/glibc-2.3-head/NOTES-2.4
===================================================================
--- trunk/glibc-2.3-head/NOTES-2.4	2006-04-25 17:42:45 UTC (rev 1488)
+++ trunk/glibc-2.3-head/NOTES-2.4	2006-04-25 19:15:04 UTC (rev 1489)
@@ -51,6 +51,25 @@
 	i386/sysdep.h - drop definition of SETUP_PIC_REG(reg)
 	dl-osinfo.h - add function _dl_setup_stack_chk_guard()
 
+* missing SIG_HOLD under FreeBSD (required by POSIX)
+  (triggered only on post 2006/04/23 glibc snapshots)
+
+  workaround:
+--- sysdeps/posix/sigset.c~      2006-04-25 16:37:41.000000000 +0000
++++ sysdeps/posix/sigset.c       2006-04-25 16:37:41.000000000 +0000
+@@ -88,6 +88,10 @@
+   if (__sigprocmask (SIG_UNBLOCK, &set, &oset) < 0)
+     return SIG_ERR;
+ 
++#ifdef SIG_HOLD
+   /* If the signal was already blocked return SIG_HOLD.  */
+   return __sigismember (&oset, sig) ? SIG_HOLD : oact.sa_handler;
++#else
++  return oact.sa_handler;
++#endif
+ }
+
+
 ../src/configure --enable-add-ons=linuxthreads --with-tls --with-__thread i486-kfreebsd --prefix=...
 
 "make check" results:

Modified: trunk/glibc-2.3-head/glibc24-extra-sysdeps.diff
===================================================================
--- trunk/glibc-2.3-head/glibc24-extra-sysdeps.diff	2006-04-25 17:42:45 UTC (rev 1488)
+++ trunk/glibc-2.3-head/glibc24-extra-sysdeps.diff	2006-04-25 19:15:04 UTC (rev 1489)
@@ -15,7 +15,7 @@
 --- sysdeps/kfreebsd/kernel-posix-cpu-timers.h	1970-01-01 01:00:00.000000000 +0100
 +++ sysdeps/kfreebsd/kernel-posix-cpu-timers.h	2006-03-02 14:04:19.000000000 +0100
 @@ -0,0 +1 @@
-+/ * placeholder */
++/* placeholder */
 diff -urN -x .svn sysdeps/kfreebsd/bits/fcntl.h sysdeps/kfreebsd/bits/fcntl.h
 --- sysdeps/kfreebsd/bits/fcntl.h	2005-12-16 16:29:14.000000000 +0100
 +++ sysdeps/kfreebsd/bits/fcntl.h	2006-03-02 11:24:01.000000000 +0100
@@ -28,18 +28,6 @@
  /* File status flags for `open' and `fcntl'.  */
  #define	O_APPEND	0x0008	/* Writes append to the file.  */
  #define	O_NONBLOCK	0x0004	/* Non-blocking I/O.  */
-diff -urN -x .svn sysdeps/kfreebsd/bits/socket.h sysdeps/kfreebsd/bits/socket.h
---- sysdeps/kfreebsd/bits/socket.h	2006-01-23 17:15:53.000000000 +0100
-+++ sysdeps/kfreebsd/bits/socket.h	2006-03-02 10:26:38.000000000 +0100
-@@ -191,7 +191,7 @@
- #define MSG_EOF MSG_EOF
-     MSG_COMPAT		= 0x8000 /* Used in sendit().  */
- #define MSG_COMPAT MSG_COMPAT
--#if 0 /* available since FreeBSD 6.0 */
-+#if 1 /* available since FreeBSD 6.0 */
-     ,MSG_NOSIGNAL	= 0x20000 /* do not generate SIGPIPE on EOF */
- #define MSG_NOSIGNAL MSG_NOSIGNAL 
- #endif
 diff -urN -x .svn sysdeps/kfreebsd/check_fds.c sysdeps/kfreebsd/check_fds.c
 --- sysdeps/kfreebsd/check_fds.c	1970-01-01 01:00:00.000000000 +0100
 +++ sysdeps/kfreebsd/check_fds.c	2006-03-02 10:30:14.000000000 +0100