From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 4 May 2004 16:47:14 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~487
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50c2b6d7d991ac885725dce5f2e76669e24915c6;p=thirdparty%2Fglibc.git

Update.

2004-05-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/sysdep.S (USE___THREAD): Remove
	defined.
---

diff --git a/ChangeLog b/ChangeLog
index 50b88bde12e..38abed4f7cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/sysdep.S (USE___THREAD): Remove
+	defined.
+
 2004-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/ia64/fpu/libm_support.h (__libm_error_support): Add
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 078b4817d86..11b282a0905 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (USE___THREAD):
+	Change conditional from ifdef to if.
+
 2004-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (SYSDEP_CANCEL_ERRNO,
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index a360c68fe31..619f28c4aab 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -27,7 +27,7 @@
 
 # undef PSEUDO
 
-# ifdef USE___THREAD
+# if USE___THREAD
 #  ifndef NOT_IN_libc
 #   define SYSDEP_CANCEL_ERRNO __libc_errno
 #  else
diff --git a/signal/Versions b/signal/Versions
index c53276b0848..0217a4089d2 100644
--- a/signal/Versions
+++ b/signal/Versions
@@ -49,7 +49,4 @@ libc {
     # Needed to provide a pointer to the XPG sigpause function.
     __xpg_sigpause;
   }
-  GLIBC_PRIVATE {
-    __sigtimedwait; __sigwait; __sigwaitinfo;
-  }
 }
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.S b/sysdeps/unix/sysv/linux/ia64/sysdep.S
index 24780a1692d..3b4b600b42e 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.S
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.S
@@ -34,7 +34,7 @@ ENTRY(__syscall_error)
 	;;
 	st4	[r2]=r8
 	mov	r8=-1
-#elif defined USE___THREAD
+#elif USE___THREAD
 # ifndef NOT_IN_libc
 #  define SYSCALL_ERROR_ERRNO __libc_errno
 # else