From 5ae9d168f66cc6b40f74cfb4a8f2631fc1df6a2a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Mar 1997 20:00:48 +0000 Subject: Update. 1997-03-21 20:55 Ulrich Drepper * sysdeps/generic/machine-gmon.h: Update copyright. * sysdeps/i386/Makefile [$(subdir)=gmon] (sysdep_routines): Add i386-mcount. * sysdeps/i386/dl-machine.h [PROF] (_dl_runtime_resolve): Don't use regparam mechanism for call of `fixup' call. * sysdeps/i386/Dist: New file. * sysdeps/i386/i386-mcount.S: New file. `mcount' entry point. * sysdeps/i386/machine-gmon.h: New file. i386 specific version of gmon definitions. 1997-03-20 13:39 Andreas Jaeger * stdlib/tst-strtol.c (main): Save the value of errno since printf may modify it, use the saved errno everywhere. * stdlib/tst-strtod.c (main): Likewise. 1997-03-21 05:54 Ulrich Drepper * posix/glob.c (glob): Fix completely broken handling of GLOB_BRACE and partly broken handling of GLOB_TILDE. Reported by Dennis Henriksen . 1997-03-20 20:22 Ulrich Drepper * sysdeps/unix/sysv/linux/readv.c: Don't emulate readv with small UIO_FASTIOV value by multiple readv calls since we need atomicity. * sysdeps/unix/sysv/linux/writev.c: Likewise. Reported by Matthis Urlichs. 1997-03-20 04:34 Roland McGrath * sysdeps/unix/sysv/linux/i386/sysdep.S (CALL_MCOUNT): Clear this macro so ENTRY(__syscall_error) doesn't insert a call to _mcount, which clobbers %eax. * Makeconfig [$(elf)=yes] (+prector, +postctor): New variables for crtbegin.o/crtend.o, using gcc to find them. (+link): Use them. 1997-03-20 00:06 Richard Henderson * gmon/sys/gmon.h: Revert the bulk of the 960930 changes, as they affect the alignment, and therefore the end padding of the structs. Reported by David Mosberger . * gmon.c: Declare the variables with aligned tags to compensate. Use __writev instead of write for the I/O. * misc/sys/uio.h: Declare __writev and __readv. * sysdeps/posix/readv.c: Rename and alias readv to __readv. * sysdeps/posix/writev.c: Likewise for writev. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/unix/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * stdlib/testdiv.c: Exit with error status when we have an error. * sysdeps/alpha/div.S: Initialize `quotient' and `mask'. * sysdeps/alpha/ldiv.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Include ctype.h for isdigit. 1997-03-20 14:51 Ulrich Drepper * nis/nis_file.c: Unify error handling. 1997-03-19 18:36 Thorsten Kukuk * nis/nis_file.c (writeColdStartFile): Fix typo. * nis/nis_free.c (nis_free_endpoints): Use unsigned int. * nis/nis_free.c (nis_free_servers): Likewise. * nis/rpcsvc/nislib.h: Likewise. * sunrpc/rpc/netdb.h: Add setrpcent and endrpcent prototypes. --- sysdeps/alpha/div.S | 21 ++++++----- sysdeps/alpha/ldiv.S | 19 +++++----- sysdeps/generic/machine-gmon.h | 34 +++++++++--------- sysdeps/i386/Dist | 2 ++ sysdeps/i386/Makefile | 4 +++ sysdeps/i386/dl-machine.h | 32 +++++++++++++++-- sysdeps/i386/i386-mcount.S | 65 ++++++++++++++++++++++++++++++++++ sysdeps/i386/machine-gmon.h | 41 +++++++++++++++++++++ sysdeps/posix/readv.c | 9 +++-- sysdeps/posix/writev.c | 9 +++-- sysdeps/stub/readv.c | 31 ++++++++-------- sysdeps/stub/writev.c | 31 ++++++++-------- sysdeps/unix/syscalls.list | 4 +-- sysdeps/unix/sysv/linux/alpha/ioperm.c | 1 + sysdeps/unix/sysv/linux/i386/sysdep.S | 5 ++- sysdeps/unix/sysv/linux/readv.c | 32 +++++++---------- sysdeps/unix/sysv/linux/writev.c | 31 +++++++--------- 17 files changed, 254 insertions(+), 117 deletions(-) create mode 100644 sysdeps/i386/Dist create mode 100644 sysdeps/i386/i386-mcount.S create mode 100644 sysdeps/i386/machine-gmon.h (limited to 'sysdeps') diff --git a/sysdeps/alpha/div.S b/sysdeps/alpha/div.S index 6c461c40d4..6a5c4429e8 100644 --- a/sysdeps/alpha/div.S +++ b/sysdeps/alpha/div.S @@ -1,7 +1,6 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. - Contributed by Richard Henderson (rth@tamu.edu) - +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Richard Henderson . The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -14,10 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, write to the Free Software Foundation, Inc., 675 Mass Ave, - Cambridge, MA 02139, USA. */ - + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include @@ -44,7 +42,6 @@ div: .prologue 0 #endif -#define dividend t0 #define divisor t1 #define mask t2 #define quotient t3 @@ -54,11 +51,13 @@ div: #define compare t7 /* find correct sign for input to unsigned divide loop. */ + negl a1, modulus # e0 : + negl a2, divisor # .. e1 : sextl a1, a1 # e0 : sextl a2, a2 # .. e1 : - negl a1, dividend # e0 : - negl a2, divisor # .. e1 : - cmovge a1, a1, dividend # e0 : + mov zero, quotient # e0 : + mov 1, mask # .. e1 : + cmovge a1, a1, modulus # e0 : cmovge a2, a2, divisor # .. e1 : beq a2, $divbyzero # e1 : unop # : diff --git a/sysdeps/alpha/ldiv.S b/sysdeps/alpha/ldiv.S index ebbe055870..08bf8eb08d 100644 --- a/sysdeps/alpha/ldiv.S +++ b/sysdeps/alpha/ldiv.S @@ -1,7 +1,6 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. - Contributed by Richard Henderson (rth@tamu.edu) - +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Richard Henderson . The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -14,10 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, write to the Free Software Foundation, Inc., 675 Mass Ave, - Cambridge, MA 02139, USA. */ - + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include @@ -44,7 +42,6 @@ ldiv: .prologue 0 #endif -#define dividend t0 #define divisor t1 #define mask t2 #define quotient t3 @@ -54,11 +51,13 @@ ldiv: #define compare t7 /* find correct sign for input to unsigned divide loop. */ - mov a1, dividend # e0 : + mov a1, modulus # e0 : mov a2, divisor # .. e1 : negq a1, tmp1 # e0 : negq a2, tmp2 # .. e1 : - cmovlt a1, tmp1, dividend # e0 : + mov zero, quotient # e0 : + mov 1, mask # .. e1 : + cmovlt a1, tmp1, modulus # e0 : cmovlt a2, tmp2, divisor # .. e1 : beq a2, $divbyzero # e1 : unop # : diff --git a/sysdeps/generic/machine-gmon.h b/sysdeps/generic/machine-gmon.h index 31f852dece..c4a2168322 100644 --- a/sysdeps/generic/machine-gmon.h +++ b/sysdeps/generic/machine-gmon.h @@ -1,21 +1,21 @@ /* Machine-dependent definitions for profiling support. Generic GCC 2 version. -Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* GCC version 2 gives us a perfect magical function to get just the information we need: diff --git a/sysdeps/i386/Dist b/sysdeps/i386/Dist new file mode 100644 index 0000000000..50c07d120a --- /dev/null +++ b/sysdeps/i386/Dist @@ -0,0 +1,2 @@ +i386-mcount.S +machine-gmon.h diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index 21caf42052..35e0422bdb 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -5,6 +5,10 @@ asm-CPPFLAGS := $(asm-CPPFLAGS) -DGAS_SYNTAX # The i386 `long double' is a distinct type we support. long-double-fcts = yes +ifeq ($(subdir),gmon) +sysdep_routines += i386-mcount +endif + ifeq ($(subdir),elf) CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused CFLAGS-dl-load.c += -Wno-unused diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 90ec6ce9f9..40623e795c 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -70,11 +70,16 @@ elf_machine_load_address (void) (dynamic_info)[DT_RELSZ]->d_un.d_val -= sizeof (Elf32_Rel); +#ifndef PROF /* We add a declaration of this function here so that in dl-runtime.c the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters - in registers. */ + in registers. + + We cannot use this scheme for profiling because the _mcount call + destroys the passed register information. */ static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset) __attribute__ ((regparm (2), unused)); +#endif /* Set up the loaded object described by L so its unrelocated PLT entries will jump to the on-demand fixup code in dl-runtime.c. */ @@ -101,7 +106,8 @@ elf_machine_runtime_setup (struct link_map *l, int lazy) /* This code is used in dl-runtime.c to call the `fixup' function and then redirect to the address it returns. */ -#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ +#ifndef PROF +# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ .globl _dl_runtime_resolve .type _dl_runtime_resolve, @function _dl_runtime_resolve: @@ -117,6 +123,28 @@ _dl_runtime_resolve: ret $8 # Jump to function address. .size _dl_runtime_resolve, .-_dl_runtime_resolve "); +#else +# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ + .globl _dl_runtime_resolve + .type _dl_runtime_resolve, @function +_dl_runtime_resolve: + pushl %eax # Preserve registers otherwise clobbered. + pushl %ecx + pushl %edx + movl 16(%esp), %edx # Push the arguments for `fixup' + movl 12(%esp), %eax + pushl %edx + pushl %eax + call fixup # Call resolver. + popl %edx # Pop the parameters + popl %ecx + popl %edx # Get register content back. + popl %ecx + xchgl %eax, (%esp) # Get %eax contents end store function address. + ret $8 # Jump to function address. + .size _dl_runtime_resolve, .-_dl_runtime_resolve +"); +#endif /* The PLT uses Elf32_Rel relocs. */ #define elf_machine_relplt elf_machine_rel } diff --git a/sysdeps/i386/i386-mcount.S b/sysdeps/i386/i386-mcount.S new file mode 100644 index 0000000000..60d52e98fa --- /dev/null +++ b/sysdeps/i386/i386-mcount.S @@ -0,0 +1,65 @@ +/* i386-specific implemetation of profiling support. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + +/* We need a special version of the `mcount' function since for ix86 it + must not clobber any register. This has several reasons: + - there is a bug in gcc as of version 2.7.2.2 which prohibits the + use of profiling together with nested functions + - the ELF `fixup' function uses GCC's regparm feature + - some (future) systems might want to pass parameters in registers. */ + + ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(_mcount) + ASM_TYPE_DIRECTIVE(C_SYMBOL_NAME(_mcount), @function) + .align ALIGNARG(4) +C_LABEL(_mcount) + /* Save the caller-clobbered registers. */ + pushl %eax + pushl %ecx + pushl %edx + + movl 12(%esp), %eax + movl 4(%ebp), %ecx + pushl %eax + pushl %ecx + +#ifdef PIC + call 1f +1: popl %ecx + addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx + movl C_SYMBOL_NAME(__mcount_internal@GOTOFF)(%ecx), %eax + call *%eax +#else + call C_SYMBOL_NAME(__mcount_internal) +#endif + popl %ecx + popl %eax /* Pop the parameters. */ + + /* Pop the saved registers. Please note that `mcount' has no + return value. */ + popl %edx + popl %ecx + popl %eax + ret + ASM_SIZE_DIRECTIVE(C_SYMBOL_NAME(_mcount)) + +#undef mcount +weak_alias(_mcount, mcount) diff --git a/sysdeps/i386/machine-gmon.h b/sysdeps/i386/machine-gmon.h new file mode 100644 index 0000000000..496a57eb84 --- /dev/null +++ b/sysdeps/i386/machine-gmon.h @@ -0,0 +1,41 @@ +/* i386-specific implemetation of profiling support. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + +/* We need a special version of the `mcount' function since for ix86 it + must not clobber any register. This has several reasons: + - there is a bug in gcc as of version 2.7.2.2 which prohibits the + use of profiling together with nested functions + - the ELF `fixup' function uses GCC's regparm feature + - some (future) systems might want to pass parameters in registers. */ + +/* We must not pollute the global namespace. */ +#define mcount_internal __mcount_internal + +void mcount_internal (u_long frompc, u_long selfpc); + +#define _MCOUNT_DECL(frompc, selfpc) \ +void mcount_internal (u_long frompc, u_long selfpc) + + +/* Define MCOUNT as empty since we have a the implementation in another + file. */ +#define MCOUNT diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c index 878accaf92..e4a2163f6d 100644 --- a/sysdeps/posix/readv.c +++ b/sysdeps/posix/readv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ Operates just like `read' (see ) except that data are put in VECTOR instead of a contiguous buffer. */ ssize_t -readv (fd, vector, count) +__readv (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -46,7 +46,7 @@ readv (fd, vector, count) buffer = (char *) __alloca (bytes); /* Read the data. */ - bytes_read = read (fd, buffer, bytes); + bytes_read = __read (fd, buffer, bytes); if (bytes_read <= 0) return -1; @@ -67,3 +67,6 @@ readv (fd, vector, count) return bytes_read; } +#ifndef __readv +weak_alias (__readv, readv) +#endif diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c index 2f0572f837..f6f685ce7a 100644 --- a/sysdeps/posix/writev.c +++ b/sysdeps/posix/writev.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ Operates just like `write' (see ) except that the data are taken from VECTOR instead of a contiguous buffer. */ ssize_t -writev (fd, vector, count) +__writev (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -61,5 +61,8 @@ writev (fd, vector, count) break; } - return write (fd, buffer, bytes); + return __write (fd, buffer, bytes); } +#ifndef __writev +weak_alias (__writev, writev) +#endif diff --git a/sysdeps/stub/readv.c b/sysdeps/stub/readv.c index b537499b07..a3240df239 100644 --- a/sysdeps/stub/readv.c +++ b/sysdeps/stub/readv.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include #include @@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */ Operates just like `read' (see ) except that data are put in VECTOR instead of a contiguous buffer. */ int -readv (fd, vector, count) +__readv (fd, vector, count) int fd; const struct iovec *vector; size_t count; @@ -34,5 +34,6 @@ readv (fd, vector, count) __set_errno (ENOSYS); return -1; } +weak_alias (__readv, readv) stub_warning (readv) diff --git a/sysdeps/stub/writev.c b/sysdeps/stub/writev.c index 593880c0e9..1fd7c2ec73 100644 --- a/sysdeps/stub/writev.c +++ b/sysdeps/stub/writev.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include #include @@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */ Operates just like `write' (see ) except that the data are taken from VECTOR instead of a contiguous buffer. */ int -writev (fd, vector, count) +__writev (fd, vector, count) int fd; const struct iovec *vector; size_t count; @@ -34,5 +34,6 @@ writev (fd, vector, count) __set_errno (ENOSYS); return -1; } +weak_alias (__writev, writev) stub_warning (writev) diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index 9a2325c35c..5ececa058c 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -31,7 +31,7 @@ profil - profil 4 profil ptrace - ptrace 4 ptrace read - read 3 __libc_read __read read readlink - readlink 3 __readlink readlink -readv - readv 3 readv +readv - readv 3 __readv readv reboot - reboot 1 reboot rename - rename 2 rename rmdir - rmdir 1 __rmdir rmdir @@ -62,4 +62,4 @@ uname - uname 1 uname unlink - unlink 1 __unlink unlink utimes - utimes 2 __utimes utimes write - write 3 __libc_write __write write -writev - writev 3 writev +writev - writev 3 __writev writev diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c index b39f39a0d7..63bf17588a 100644 --- a/sysdeps/unix/sysv/linux/alpha/ioperm.c +++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index 4b86d1dfe7..a686495818 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,6 +45,9 @@ _errno = errno /* This name is expected by hj's libc.so.5 startup code. */ The code for Linux is almost identical to the canonical Unix/i386 code, except that the error number in %eax is negated. */ +#undef CALL_MCOUNT +#define CALL_MCOUNT /* Don't insert the profiling call, it clobbers %eax. */ + ENTRY (__syscall_error) negl %eax diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c index c8ff55ab45..2c215ce920 100644 --- a/sysdeps/unix/sysv/linux/readv.c +++ b/sysdeps/unix/sysv/linux/readv.c @@ -23,6 +23,8 @@ #include extern ssize_t __syscall_readv __P ((int, __const struct iovec *, int)); +static ssize_t __atomic_readv_replacement __P ((int, __const struct iovec *, + int)); /* Not all versions of the kernel support the large number of records. */ @@ -34,7 +36,7 @@ extern ssize_t __syscall_readv __P ((int, __const struct iovec *, int)); /* We should deal with kernel which have a smaller UIO_FASTIOV as well as a very big count. */ ssize_t -readv (fd, vector, count) +__readv (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -44,25 +46,15 @@ readv (fd, vector, count) bytes_read = __syscall_readv (fd, vector, count); - if (bytes_read < 0 && errno == EINVAL && count > UIO_FASTIOV) - { - int i; + if (bytes_read >= 0 || errno != EINVAL || count <= UIO_FASTIOV) + return bytes_read; - /* Restore the old error value as if nothing happened. */ - __set_errno (errno_saved); + /* Restore the old error value as if nothing happened. */ + __set_errno (errno_saved); - bytes_read = 0; - for (i = 0; i < count; i += UIO_FASTIOV) - { - ssize_t bytes = __syscall_readv (fd, vector + i, - MIN (count - i, UIO_FASTIOV)); - - if (bytes < 0) - return bytes; - - bytes_read += bytes; - } - } - - return bytes_read; + return __atomic_readv_replacement (fd, vector, count); } +weak_alias (__readv, readv) + +#define __readv static __atomic_readv_replacement +#include diff --git a/sysdeps/unix/sysv/linux/writev.c b/sysdeps/unix/sysv/linux/writev.c index d147186b51..31e794fb04 100644 --- a/sysdeps/unix/sysv/linux/writev.c +++ b/sysdeps/unix/sysv/linux/writev.c @@ -23,6 +23,9 @@ #include extern ssize_t __syscall_writev __P ((int, const struct iovec *, int)); +static ssize_t __atomic_writev_replacement __P ((int, const struct iovec *, + int)); + /* Not all versions of the kernel support the large number of records. */ #ifndef UIO_FASTIOV @@ -33,7 +36,7 @@ extern ssize_t __syscall_writev __P ((int, const struct iovec *, int)); /* We should deal with kernel which have a smaller UIO_FASTIOV as well as a very big count. */ ssize_t -writev (fd, vector, count) +__writev (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -43,23 +46,15 @@ writev (fd, vector, count) bytes_written = __syscall_writev (fd, vector, count); - if (bytes_written < 0 && errno == EINVAL && count > UIO_FASTIOV) - { - int i; - - /* Restore the old error value as if nothing happened. */ - __set_errno (errno_saved); + if (bytes_written >= 0 || errno != EINVAL || count <= UIO_FASTIOV) + return bytes_written; - bytes_written = 0; - for (i = 0; i < count; i += UIO_FASTIOV) - { - ssize_t bytes = __syscall_writev (fd, vector + i, - MIN (count - i, UIO_FASTIOV)); + /* Restore the old error value as if nothing happened. */ + __set_errno (errno_saved); - if (bytes < 0) - return bytes_written > 0 ? bytes_written : bytes; - } - } - - return bytes_written; + return __atomic_writev_replacement (fd, vector, count); } +weak_alias (__writev, writev) + +#define __writev static __atomic_writev_replacement +#include -- cgit 1.4.1