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 504cbbe..1f2744d 100644 (file)
--- 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 1b0f473..998af79 100644 (file)
--- 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 501791c..3dc83fc 100644 (file)
--- 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 4344c5d..8d87ffa 100644 (file)
--- 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;
 }