Wed Oct 25 14:23:35 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

	* sysdeps/unix/sysv/linux/stat.c: New file.
	* sysdeps/unix/sysv/linux/fstat.c: New file.
	* sysdeps/unix/sysv/linux/lstat.c: New file.
	* sysdeps/unix/sysv/linux/i386/stat.S: File removed.
	* sysdeps/unix/sysv/linux/i386/fstat.S: File removed.
	* sysdeps/unix/sysv/linux/i386/lstat.S: File removed.

5 files changed, 71 insertions, 30 deletions

diff --git a/sysdeps/unix/sysv/linux/fstat.c b/sysdeps/unix/sysv/linux/fstat.c
new file mode 100644
index 0000000000..e6ef27094d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/fstat.c
@@ -0,0 +1,32 @@
+/* Copyright (C) 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 <sys/stat.h>
+
+/* In Linux the `stat' call is actually done by emulating a `xstat' system
+   call, which takes an additional first argument giving a version number
+   for `struct stat'.  Likewise for `fstat' and `lstat' there are `fxstat'
+   and `lxstat' emulations.  */
+
+int
+__fstat (int fd, struct stat *buf)
+{
+  return __fxstat (_STAT_VER, fd, buf);
+}
+
+weak_alias (__fstat, fstat)
diff --git a/sysdeps/unix/sysv/linux/i386/fstat.S b/sysdeps/unix/sysv/linux/i386/fstat.S
deleted file mode 100644
index 434ad4ad64..0000000000
--- a/sysdeps/unix/sysv/linux/i386/fstat.S
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __stat __fstat
-#define stat fstat
-#define __xstat __fxstat
-#include "stat.S"
diff --git a/sysdeps/unix/sysv/linux/i386/lstat.S b/sysdeps/unix/sysv/linux/i386/lstat.S
deleted file mode 100644
index 9135c6bfe1..0000000000
--- a/sysdeps/unix/sysv/linux/i386/lstat.S
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __stat __lstat
-#define stat lstat
-#define __xstat __lxstat
-#include "stat.S"
diff --git a/sysdeps/unix/sysv/linux/lstat.c b/sysdeps/unix/sysv/linux/lstat.c
new file mode 100644
index 0000000000..51597b8f4d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/lstat.c
@@ -0,0 +1,32 @@
+/* Copyright (C) 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 <sys/stat.h>
+
+/* In Linux the `stat' call is actually done by emulating a `xstat' system
+   call, which takes an additional first argument giving a version number
+   for `struct stat'.  Likewise for `fstat' and `lstat' there are `fxstat'
+   and `lxstat' emulations.  */
+
+int
+__lstat (const char *file, struct stat *buf)
+{
+  return __lxstat (_STAT_VER, file, buf);
+}
+
+weak_alias (__lstat, lstat)
diff --git a/sysdeps/unix/sysv/linux/i386/stat.S b/sysdeps/unix/sysv/linux/stat.c
index 5902c21eb2..cfdf46f49d 100644
--- a/sysdeps/unix/sysv/linux/i386/stat.S
+++ b/sysdeps/unix/sysv/linux/stat.c
@@ -16,32 +16,17 @@ 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 <sysdep.h>
+#include <sys/stat.h>
 
 /* In Linux the `stat' call is actually done by emulating a `xstat' system
    call, which takes an additional first argument giving a version number
    for `struct stat'.  Likewise for `fstat' and `lstat' there are `fxstat'
-   and `lxstat' emulations.  This macro gives the Linux version number that
-   corresponds to the definition of `struct stat' in <statbuf.h>.  */
-#define	_STAT_VER	1
+   and `lxstat' emulations.  */
 
-ENTRY (__stat)
-	movl 8(%esp), %eax
-	movl 4(%esp), %ecx
-#ifdef	PIC
-	pushl %ebx
-	call 0f
-0:	popl %ebx
-	addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx
-#endif
-	pushl %eax
-	pushl %ecx
-	pushl $_STAT_VER	/* Push extra first arg to syscall.  */
-	call JUMPTARGET(__xstat)/* Jump to xstat implementation.  */
-	addl $12, %esp
-#ifdef	PIC
-	popl %ebx
-#endif
-	ret
+int
+__stat (const char *file, struct stat *buf)
+{
+  return __xstat (_STAT_VER, file, buf);
+}
 
 weak_alias (__stat, stat)