From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 20 Apr 2004 04:31:12 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~506
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfa2612286e765dc52b510fdb753a238f0a1126d;p=thirdparty%2Fglibc.git

Update.

2004-04-19  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/mq_unlink.c: Rewrite to produce more
	compact code.
---

diff --git a/ChangeLog b/ChangeLog
index 504cbbe5f34..1f2744df7a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/mq_unlink.c: Rewrite to produce more
+	compact code.
+
 2004-04-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* stdio-common/vfscanf.c (_IO_vfscanf): When skipping whitespace,
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1b0f473a1d8..998af796303 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-19  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (CENABLE): Define
+	for librt.  Save the return value to a safe register.
+	(CDISABLE): Define for librt.  Set the function argument correctly.
+
 2004-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 501791c6618..3dc83fcf431 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/mq_unlink.c: Rewrite to produce more
+	compact code.
+
 2004-04-19  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/unix/sysv/linux/sh/sem_timedwait.S: Add frame info.
diff --git a/sysdeps/unix/sysv/linux/mq_unlink.c b/sysdeps/unix/sysv/linux/mq_unlink.c
index 4344c5d0ef4..8d87ffadf46 100644
--- a/sysdeps/unix/sysv/linux/mq_unlink.c
+++ b/sysdeps/unix/sysv/linux/mq_unlink.c
@@ -32,12 +32,19 @@ mq_unlink (const char *name)
       return -1;
     }
 
-  int ret = INLINE_SYSCALL (mq_unlink, 1, name + 1);
+  INTERNAL_SYSCALL_DECL (err);
+  int ret = INTERNAL_SYSCALL (mq_unlink, err, 1, name + 1);
 
   /* While unlink can return either EPERM or EACCES, mq_unlink should
      return just EACCES.  */
-  if (ret < 0 && errno == EPERM)
-    __set_errno (EACCES);
+  if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (ret, err), 0))
+    {
+      ret = INTERNAL_SYSCALL_ERRNO (ret, err);
+      if (ret == EPERM)
+	ret = EACCES;
+      __set_errno (ret);
+      ret = -1;
+    }
 
   return ret;
 }