[Glibc-bsd-commits] r1947 - in trunk/glibc-ports/kfreebsd: . linuxthreads

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-05-26 05:39:56 +0000 (Sat, 26 May 2007)
New Revision: 1947

Added:
   trunk/glibc-ports/kfreebsd/linuxthreads/fatal-prepare.h
Modified:
   trunk/glibc-ports/kfreebsd/Makefile
Log:
* add <fatal-prepare.h> also for GNU/kFreeBSD



Modified: trunk/glibc-ports/kfreebsd/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/Makefile	2007-05-25 21:56:07 UTC (rev 1946)
+++ trunk/glibc-ports/kfreebsd/Makefile	2007-05-26 05:39:56 UTC (rev 1947)
@@ -24,6 +24,11 @@
 sysdep_routines += errno-loc
 endif
 
+ifeq ($(subdir),assert)
+CFLAGS-assert.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
+CFLAGS-assert-perr.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
+endif
+
 ifeq ($(subdir),io)
 # For <unistd.h>.
 sysdep_routines += sys_getcwd sys_lseek

Added: trunk/glibc-ports/kfreebsd/linuxthreads/fatal-prepare.h
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/fatal-prepare.h	                        (rev 0)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/fatal-prepare.h	2007-05-26 05:39:56 UTC (rev 1947)
@@ -0,0 +1,39 @@
+/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <pthread.h>
+
+/* We have to completely disable cancellation.  assert() must not be a
+   cancellation point but the implementation uses write() etc.  */
+#ifdef SHARED
+# include <pthread-functions.h>
+# define FATAL_PREPARE \
+  {									      \
+    int (*fp) (int, int *);                                                   \
+    fp = __libc_pthread_functions.ptr_pthread_setcancelstate;                 \
+    if (fp != NULL)                                                           \
+      fp (PTHREAD_CANCEL_DISABLE, NULL);                                      \
+  }
+#else
+# pragma weak pthread_setcancelstate
+# define FATAL_PREPARE \
+  {									      \
+    if (pthread_setcancelstate != NULL)					      \
+      pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);		      \
+  }
+#endif