From 94f3c30dc2d8193f977daf04414b1edd815ced83 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 17 Feb 2010 14:28:38 -0800 Subject: Assorted fixed to get nptl compiling on ARM Signed-off-by: Khem Raj --- libc/sysdeps/linux/common/not-cancel.h | 61 ++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 10 deletions(-) (limited to 'libc/sysdeps/linux/common/not-cancel.h') diff --git a/libc/sysdeps/linux/common/not-cancel.h b/libc/sysdeps/linux/common/not-cancel.h index ebdc6078d..9418417b4 100644 --- a/libc/sysdeps/linux/common/not-cancel.h +++ b/libc/sysdeps/linux/common/not-cancel.h @@ -1,19 +1,60 @@ -/* By default we have none. Map the name to the normal functions. */ +/* Uncancelable versions of cancelable interfaces. Linux version. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + 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 + +/* Uncancelable open. */ #define open_not_cancel(name, flags, mode) \ - open (name, flags, mode) + INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode)) #define open_not_cancel_2(name, flags) \ - open (name, flags) + INLINE_SYSCALL (open, 2, (const char *) (name), (flags)) + +/* Uncancelable close. */ #define close_not_cancel(fd) \ - close (fd) + INLINE_SYSCALL (close, 1, fd) #define close_not_cancel_no_status(fd) \ - (void) close (fd) + (void) ({ INTERNAL_SYSCALL_DECL (err); \ + INTERNAL_SYSCALL (close, err, 1, (fd)); }) + +/* Uncancelable read. */ #define read_not_cancel(fd, buf, n) \ - read (fd, buf, n) + INLINE_SYSCALL (read, 3, (fd), (buf), (n)) + +/* Uncancelable write. */ #define write_not_cancel(fd, buf, n) \ - write (fd, buf, n) + INLINE_SYSCALL (write, 3, (fd), (buf), (n)) + +/* Uncancelable writev. */ #define writev_not_cancel_no_status(fd, iov, n) \ - (void) writev (fd, iov, n) + (void) ({ INTERNAL_SYSCALL_DECL (err); \ + INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); }) + +/* Uncancelable fcntl. */ #define fcntl_not_cancel(fd, cmd, val) \ - fcntl (fd, cmd, val) + __fcntl_nocancel (fd, cmd, val) + +/* Uncancelable waitpid. */ +#ifdef __NR_waitpid # define waitpid_not_cancel(pid, stat_loc, options) \ - waitpid (pid, stat_loc, options) + INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options) +#else +# define waitpid_not_cancel(pid, stat_loc, options) \ + INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) +#endif -- cgit v1.2.3