Fix __fxstat which is called from fstat. Remove obsolete fstat64.

io/sys/stat.h

Index: io/sys/stat.h
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 364c43f8f4c3c30d4ae78e9def5d1fd15ec28e9f..57c10ca7bdd74ba28324d22a458b4f0ae86085df 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -393,7 +393,7 @@ extern int futimens (int __fd, __const struct timespec __times[2]) __THROW;
 #endif
 
 /* Wrappers for stat and mknod system calls.  */
-#ifndef __USE_FILE_OFFSET64
+#if !defined __USE_FILE_OFFSET64 || defined __native_client__

[eaeltsin, 2011/01/13 10:43:45]

Why do you need to check for native client here?
Probably everything should be set by features.h?

[halyavin, 2011/01/13 11:15:21]

Yes, we do. Because we implement __USE_FILE_OFFSET64 mode but do not need to map
__fxstat to __fxstat64 since we don't have __fxstat64 at all.

 extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf)
      __THROW __nonnull ((3));
 extern int __xstat (int __ver, __const char *__filename,
@@ -428,6 +428,9 @@ extern int __REDIRECT_NTH (__fxstatat, (int __ver, int __fildes,
 
 #ifdef __USE_LARGEFILE64
 extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf)
+#if defined __native_client__ && (!defined SHARED || defined NOT_IN_libc)
+     __asm__ ("__fxstat")

[eaeltsin, 2011/01/13 10:43:45]

Please add a comment on this.

[halyavin, 2011/01/13 11:15:21]

We are going to have a dozen of such lines (one for every file function) and it
doesn't make sense to have an identical comment for every one of them.

This line maps __fxstat64 to __fxstat in cases:
1. Other glibc libraries.
  They actively use such functions and so we have to compile them in
__USE_LARGEFILE64 mode.
2. glibc itself in static mode.
  Glibc itself uses __fxstat64 and must be compiled in __USE_LARGEFILE64 mode.

glibc itself in shared mode maps __fxstat64 to __GI___fxstat64. So we can't map
it that way. The mapping is done in fxstat.c instead.

+#endif
      __THROW __nonnull ((3));
 extern int __xstat64 (int __ver, __const char *__filename,
 		      struct stat64 *__stat_buf) __THROW __nonnull ((2, 3));