- cleanup {,f}stat{,v}fs{,64} relocs

libc/misc/statfs/fstatfs64.c

@@ -26,7 +26,8 @@
 #include <stddef.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fstatfs)
+extern __typeof(fstatfs) __libc_fstatfs;
+libc_hidden_proto(__libc_fstatfs)
 
 /* Return information about the filesystem on which FD resides.  */
 libc_hidden_proto(fstatfs64)
@@ -34,7 +35,7 @@ int fstatfs64 (int fd, struct statfs64 *buf)
 {
     struct statfs buf32;
 
-    if (fstatfs (fd, &buf32) < 0)
+    if (__libc_fstatfs (fd, &buf32) < 0)
 	return -1;
 
     buf->f_type = buf32.f_type;

libc/misc/statfs/fstatvfs.c

@@ -33,6 +33,7 @@
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)
+libc_hidden_proto(stat)
 
 #ifndef __USE_FILE_OFFSET64
 extern int fstatfs (int __fildes, struct statfs *__buf)
@@ -50,6 +51,7 @@ extern __typeof(fstatfs) __libc_fstatfs;
 libc_hidden_proto(__libc_fstatfs)
 libc_hidden_proto(fstat)
 libc_hidden_proto(stat)
+libc_hidden_proto(fstatvfs)
 
 int fstatvfs (int fd, struct statvfs *buf)
 {
@@ -66,3 +68,4 @@ int fstatvfs (int fd, struct statvfs *buf)
     /* We signal success if the statfs call succeeded.  */
     return 0;
 }
+libc_hidden_def(fstatvfs)

libc/misc/statfs/fstatvfs64.c

@@ -38,11 +38,13 @@ libc_hidden_proto(endmntent)
 
 #undef stat
 #define stat stat64
-#if defined __UCLIBC_LINUX_SPECIFIC__
+#if !defined __UCLIBC_LINUX_SPECIFIC__
+libc_hidden_proto(fstatvfs)
+#else
 libc_hidden_proto(fstatfs64)
-libc_hidden_proto(fstat64)
 #endif
-libc_hidden_proto(stat64)
+libc_hidden_proto(fstat64)
+libc_hidden_proto(stat)
 
 int fstatvfs64 (int fd, struct statvfs64 *buf)
 {

libc/misc/statfs/statfs64.c

@@ -23,9 +23,9 @@
 #include <stddef.h>
 #include <sys/statfs.h>
 
-
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(statfs)
+extern __typeof(statfs) __libc_statfs;
+libc_hidden_proto(__libc_statfs)
 
 /* Return information about the filesystem on which FILE resides.  */
 libc_hidden_proto(statfs64)
@@ -33,7 +33,7 @@ int statfs64 (const char *file, struct statfs64 *buf)
 {
     struct statfs buf32;
 
-    if (statfs (file, &buf32) < 0)
+    if (__libc_statfs (file, &buf32) < 0)
 	return -1;
 
     buf->f_type = buf32.f_type;

libc/sysdeps/linux/common/fstatfs.c

@@ -26,10 +26,8 @@ extern __typeof(fstatfs) __libc_fstatfs;
 libc_hidden_proto(__libc_fstatfs)
 #define __NR___libc_fstatfs __NR_fstatfs
 _syscall2(int, __libc_fstatfs, int, fd, struct statfs *, buf)
-libc_hidden_def(__libc_fstatfs)
 
 #if defined __UCLIBC_LINUX_SPECIFIC__
-libc_hidden_proto(fstatfs)
+libc_hidden_def(__libc_fstatfs)
 weak_alias(__libc_fstatfs,fstatfs)
-libc_hidden_weak(fstatfs)
 #endif

libc/sysdeps/linux/common/statfs.c

@@ -16,10 +16,8 @@ extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
 #define __NR___libc_statfs __NR_statfs
 _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf)
-libc_hidden_def(__libc_statfs)
 
 #if defined __UCLIBC_LINUX_SPECIFIC__
-libc_hidden_proto(statfs)
+libc_hidden_def(__libc_statfs)
 weak_alias(__libc_statfs,statfs)
-libc_hidden_weak(statfs)
 #endif