Merged changes from kopensolaris-gnu project

http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu/glibc.git

Commits from 9157319 to bad8ac8.

This is only partial patch, some changes to not apply
and will be resovled and committed next.

1 files changed, 98 insertions, 0 deletions

diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/not-cancel.h b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/not-cancel.h
new file mode 100644
index 0000000000..6335a3e93e
--- /dev/null
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/not-cancel.h
@@ -0,0 +1,98 @@
+/* Uncancelable versions of cancelable interfaces.  OpenSolaris version.
+   Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David Bartley <dtbartle@csclub.uwaterloo.ca>.
+
+   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 <sys/syscall.h>
+#include <sys/types.h>
+
+extern int open_not_cancel(const char *name, int flags, mode_t mode);
+#define open_not_cancel_2(name, flags) \
+    open_not_cancel((name), (flags), 0)
+
+extern int open64_not_cancel(const char *name, int flags, mode_t mode);
+#define open64_not_cancel_2(name, flags) \
+    open64_not_cancel((name), (flags), 0)
+
+extern int openat_not_cancel(int dirfd, const char *name,
+    int flags, mode_t mode);
+#define openat_not_cancel_3(fd, name, flags) \
+    openat_not_cancel((fd), (name), (flags), 0)
+
+extern int openat64_not_cancel(int dirfd, const char *name,
+    int flags, mode_t mode);
+#define openat64_not_cancel_3(fd, name, flags) \
+    openat64_not_cancel((fd), (name), (flags), 0)
+
+#define close_not_cancel(fd) \
+    syscall (SYS_close, fd)
+#define close_not_cancel_no_status(fd) \
+    ({sysret_t __ret; \
+    (void)__systemcall (&__ret, SYS_close, (fd));})
+
+#define read_not_cancel(fd, buf, n)                                     \
+    ({int __fd = (fd);                                                  \
+      void *__buf = (buf);                                              \
+      size_t __n = (n);                                                 \
+      int __ret;                                                        \
+      while ((__ret = syscall (SYS_read, __fd, __buf, __n)) == -1 &&    \
+            errno == ERESTART);                                         \
+      __ret;})
+#define write_not_cancel(fd, buf, n)                                    \
+    ({int __fd = (fd);                                                  \
+      const void *__buf = (buf);                                        \
+      size_t __n = (n);                                                 \
+      int __ret;                                                        \
+      while ((__ret = syscall (SYS_write, __fd, __buf, __n)) == -1 &&   \
+            errno == ERESTART);                                         \
+      __ret;})
+
+#define writev_not_cancel_no_status(fd, iov, n)                         \
+    ({sysret_t __ret;                                                   \
+      int __fd = (fd);                                                  \
+      const struct iovec *__iov = (iov);                                \
+      size_t __n = (n);                                                 \
+      while (__systemcall (&__ret, SYS_writev, __fd, __iov, __n) ==     \
+            ERESTART);})
+
+extern int __fcntl_not_cancel (int fd, int cmd, ...);
+#define fcntl_not_cancel(fd, cmd, val) \
+    __fcntl_not_cancel ((fd), (cmd), (val))
+
+extern __pid_t __waitpid_not_cancel(__pid_t pid, int *stat_loc, int options);
+#define waitpid_not_cancel(pid, stat_loc, options) \
+    __waitpid_not_cancel ((pid), (stat_loc), (options))
+
+# define pause_not_cancel() \
+    syscall (SYS_pause)
+
+# define nanosleep_not_cancel(requested_time, remaining) \
+    syscall (SYS_nanosleep, (requested_time), (remaining))
+
+#define sigsuspend_not_cancel(set) \
+    syscall (SYS_sigsuspend, (set))
+
+#define waitid_not_cancel(idtype, id, infop, options) \
+    ({idtype_t __idtype = (idtype);                                     \
+      id_t __id = (id);                                                 \
+      siginfo_t *__infop = (infop);                                     \
+      int __options = (options);                                        \
+      int __ret;                                                        \
+      while ((__ret = syscall (SYS_waitid, __idtype, __id, __infop,     \
+            __options)) == -1 && errno == ERESTART);                    \
+      __ret;})