From 439d1d4560aa3e261c065c43e3995779809b4cb2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 22 Jul 1995 10:48:43 +0000 Subject: Sat Jul 22 01:56:03 1995 Roland McGrath * sysdeps/unix/i386/sysdep.h (JUMPTARGET): New macro; use name@PLT #ifdef PIC. (PSEUDO): Use JUMPTARGET(syscall_error) in jump insn. * sysdeps/unix/i386/syscall.S: Use JUMPTARGET(syscall_error) in jump insn. * sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h: Rewritten. * sysdeps/unix/sysv/sysv4/linux/i386/syscall.S: New file. * sysdeps/unix/sysv/sysv4/linux/i386/socket.S: Include . Save %ebx in call-clobbered %edx instead of stack. Use JUMPTARGET(syscall_error) in jump insn. * Makeconfig (+gccwarn): Add -Wbad-function-cast -Wconversion. * sysdeps/unix/i386/sysdep.h (ENTRY): Use ASM_GLOBAL_DIRECTIVE and ASM_TYPE_DIRECTIVE. (ASM_TYPE_DIRECTIVE): New macro; defined using `.type' #ifdef ELF. * sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S (__syscall_error): Rewritten, #include'ing unix/i386/sysdep.S for most of the code. * sysdeps/unix/i386/sysdep.S [PIC]: Store into `errno' through the GOT. Fixes to help Linux, inspired by drepper's work: * configure.in (os=linux*): Use unix/sysv/sysv4 for $base_os, instead of unix/sysv. * sysdeps/posix/utimes.c: New file. * sysdeps/generic/getdomain.c: New file. * sysdeps/i386/init-first.c: Removed gratuitous #include . * sysdeps/generic/dl-sysdep.c: Include and declare externals _dl_argc, _dl_argc, and _environ. * sysdeps/unix/sysv/linux/{accept,connect,getsockname,rename, socketpair,waitpid,bind,getpeername,listen,setsid,wait4}.S: Moved to new directory sysdeps/unix/sysv/sysv4/linux. * sysdeps/unix/sysv/linux: Directory removed. * sysdeps/unix/sysv/i386/linux/{socket.S,sysdep.h,sysdep.S}: Moved to new directory sysdeps/unix/sysv/sysv4/linux/i386. * sysdeps/unix/sysv/linux/i386: Directory removed. --- sysdeps/unix/sysv/i386/linux/socket.S | 55 --------------------------------- sysdeps/unix/sysv/i386/linux/sysdep.S | 38 ----------------------- sysdeps/unix/sysv/i386/linux/sysdep.h | 57 ----------------------------------- sysdeps/unix/sysv/i386/linux/wait.S | 31 ------------------- 4 files changed, 181 deletions(-) delete mode 100644 sysdeps/unix/sysv/i386/linux/socket.S delete mode 100644 sysdeps/unix/sysv/i386/linux/sysdep.S delete mode 100644 sysdeps/unix/sysv/i386/linux/sysdep.h delete mode 100644 sysdeps/unix/sysv/i386/linux/wait.S (limited to 'sysdeps/unix/sysv/i386') diff --git a/sysdeps/unix/sysv/i386/linux/socket.S b/sysdeps/unix/sysv/i386/linux/socket.S deleted file mode 100644 index 9f59bad095..0000000000 --- a/sysdeps/unix/sysv/i386/linux/socket.S +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 1991, 1992 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. */ - -#include - -.globl syscall_error - -/* The socket-oriented system calls are handled unusally in Linux. - They are all gated through the single `socketcall' system call number. - `socketcall' takes two arguments: the first is the subcode, specifying - which socket function is being called; and the second is a pointer to - the arguments to specific function. - - The .S files for the other calls just #define socket and #include this. */ - -ENTRY (socket) - - /* Save registers. */ - pushl %ebx - pushl %ecx - - movl $__NR_socketcall, %eax /* System call number in %eax. */ - - /* Use ## so `socket' is a separate token that might be #define'd. */ - movl $SYS_##socket, %ebx /* Subcode is first arg to syscall. */ - lea 12(%esp), %ecx /* Address of args in 2nd arg. */ - - /* Do the system call trap. */ - int $0x80 - - /* Restore registers. */ - popl %ecx - popl %ebx - - /* %eax is < 0 if there was an error. */ - testl %eax, %eax - jl syscall_error - - /* Successful; return the syscall's value. */ - ret diff --git a/sysdeps/unix/sysv/i386/linux/sysdep.S b/sysdeps/unix/sysv/i386/linux/sysdep.S deleted file mode 100644 index ed3a2782a9..0000000000 --- a/sysdeps/unix/sysv/i386/linux/sysdep.S +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 1992, 1993, 1994 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. */ - -#include -#define _ERRNO_H -#include - -/* We jump here when a system call gets an error. - The error number is negated in %eax. */ -.globl syscall_error -syscall_error: - negl %eax /* Make it positive. */ -#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN - /* We translate the system's EWOULDBLOCK error into EAGAIN. - The GNU C library always defines EWOULDBLOCK==EAGAIN. - EWOULDBLOCK_sys is the original number. */ - cmpl %eax, $EWOULDBLOCK_sys /* Is it the old EWOULDBLOCK? */ - jne 0f /* Branch if not. */ - move $EAGAIN, %eax /* Yes; translate it to EAGAIN. */ -#endif -0: movl %eax, _errno /* Store it in `errno'. */ - move $-1, %eax /* Return -1. */ - ret diff --git a/sysdeps/unix/sysv/i386/linux/sysdep.h b/sysdeps/unix/sysv/i386/linux/sysdep.h deleted file mode 100644 index 298a0e4c5b..0000000000 --- a/sysdeps/unix/sysv/i386/linux/sysdep.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 1992, 1993 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. */ - -#include - -#define ENTRY(name) \ - .globl _##name; \ - .align 2; \ - _##name##: - -#define PSEUDO(name, syscall_name, args) \ - .text; \ - .globl syscall_error; \ - ENTRY (name) \ - XCHG_##args - movl $SYS_##syscall_name, %eax; \ - int $0x80; \ - test %eax, %eax; \ - jl syscall_error; \ - XCHG_##args - -/* Linux takes system call arguments in registers: - 1: %ebx - 2: %ecx - 3: %edx - 4: %esi - 5: %edi - We put the arguments into registers from the stack, - and save the registers, by using the 386 `xchg' instruction - to swap the values in both directions. */ - -#define XCHG_0 /* No arguments to frob. */ -#define XCHG_1 xchg 8(%esp), %ebx; XCHG_0 -#define XCHG_2 xchg 12(%esp), %ecx; XCHG_1 -#define XCHG_3 xchg 16(%esp), %edx; XCHG_2 -#define XCHG_4 xchg 20(%esp), %esi; XCHG_3 -#define XCHG_5 xchg 24(%esp), %edi; XCHG_3 - -#define r0 %eax /* Normal return-value register. */ -#define r1 %edx /* Secondary return-value register. */ -#define scratch %ecx /* Call-clobbered register for random use. */ -#define MOVE(x,y) movl x, y diff --git a/sysdeps/unix/sysv/i386/linux/wait.S b/sysdeps/unix/sysv/i386/linux/wait.S deleted file mode 100644 index 4be64c47c9..0000000000 --- a/sysdeps/unix/sysv/i386/linux/wait.S +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995 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. */ - -#include - -ENTRY (__wait) - movl 0(%esp), %eax /* Fetch the return address. */ - movl $-1, 0(%esp) /* First arg is -1. */ - /* Second arg is our arg at 4(%esp). */ - pushl $0 /* Third arg is 0. */ - pushl %eax /* Push the return address. */ - - /* Jump to waitpid; it will return to our caller. */ - jmp ___waitpid - -weak_alias (__wait, wait) -- cgit v1.2.3