From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 21 Apr 2003 07:48:10 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~19388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a87ee1943f6eb52b04bf11098415bed614f9253;p=external%2Fglibc.git

Update.

	* signal/sigfillset.c: Moved to...
	* sysdeps/generic/sigfillset.c: ...here.  If SIGCANCEL is defined
	do not set the corresponding bit.
---

diff --git a/ChangeLog b/ChangeLog
index be3a26c..35731e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-04-21  Ulrich Drepper  <drepper@redhat.com>
 
+	* signal/sigfillset.c: Moved to...
+	* sysdeps/generic/sigfillset.c: ...here.  If SIGCANCEL is defined
+	do not set the corresponding bit.
+
 	* sysdeps/unix/sysv/linux/sigprocmask.c: Prevent changing mask for
 	SIGCANCEL.
 	* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h: Define SI_TKILL.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 88af72f..d79514f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,7 @@
 2003-04-21  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/pthread/sigfillset.c: New file.
+
 	* init.c (__pthread_initialize_minimal): Don't block SIGTIMER.
 	* pthreadP.h: Make SIGTIMER and SIGCANCEL the same.
 	* sysdeps/pthread/pthread_sigmask.c: Remove handling of SIGTIMER.
diff --git a/nptl/sysdeps/pthread/sigfillset.c b/nptl/sysdeps/pthread/sigfillset.c
new file mode 100644
index 0000000..fe58ccd
--- /dev/null
+++ b/nptl/sysdeps/pthread/sigfillset.c
@@ -0,0 +1,21 @@
+/* Copyright (C) 2003 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 <nptl/pthreadP.h>
+
+#include <sysdeps/generic/sigfillset.c>
diff --git a/signal/sigfillset.c b/sysdeps/generic/sigfillset.c
similarity index 84%
rename from signal/sigfillset.c
rename to sysdeps/generic/sigfillset.c
index 5947701..5f91fa6 100644
--- a/signal/sigfillset.c
+++ b/sysdeps/generic/sigfillset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,96,97,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,96,97,2002, 2003 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
@@ -33,6 +33,11 @@ sigfillset (set)
 
   memset (set, 0xff, sizeof (sigset_t));
 
+  /* If the implementation uses a cancellation signal don't set the bit.  */
+#ifdef SIGCANCEL
+  __sigdelset (set, SIGCANCEL);
+#endif
+
   return 0;
 }
 libc_hidden_def (sigfillset)