Update.

2000-06-16  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/xstat.c: New file.
	* sysdeps/unix/sysv/linux/ia64/fxstat.c: New file.
	* sysdeps/unix/sysv/linux/ia64/lxstat.c: New file.

	* sysdeps/unix/sysv/linux/ia64/xstatconv.c: Deleted.

	* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Update after latest
	kernel change.

	* sysdeps/unix/sysv/linux/ia64/bits/types.h: Make __ino_t,
	__nlink_t and __blkcnt_t 64 bit to accomodate new kernel stat data
	structure.
	Change __fsblkcnt_t and __fsfilcnt_t to 64 bit to match kernel
	implementation.

2000-06-15  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/kernel_stat.h: Deleted.

2000-06-08  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/mmap64.c: New file.

2 files changed, 17 insertions, 21 deletions

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
index 6afd556597..421d0c5a48 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
@@ -31,30 +31,23 @@
 struct stat
   {
     __dev_t st_dev;		/* Device.  */
-#ifdef __USE_FILE_OFFSET64
-    __ino64_t st_ino;		/* File serial number.  */
-#else
     __ino_t st_ino;		/* File serial number.	*/
-    int __pad1;
-#endif
-    __mode_t st_mode;		/* File mode.  */
     __nlink_t st_nlink;		/* Link count.  */
+    __mode_t st_mode;		/* File mode.  */
     __uid_t st_uid;		/* User ID of the file's owner.	*/
     __gid_t st_gid;		/* Group ID of the file's group.*/
+    int pad0;
     __dev_t st_rdev;		/* Device number, if device.  */
     __off_t st_size;		/* Size of file, in bytes.  */
     __time_t st_atime;		/* Time of last access.  */
+    long int __reserved0;	/* Reserved for atime.nanoseconds.  */
     __time_t st_mtime;		/* Time of last modification.  */
+    long int __reserved1;	/* Reserved for mtime.nanoseconds.  */
     __time_t st_ctime;		/* Time of last status change.  */
-#ifdef __USE_FILE_OFFSET64
-    __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-#else
+    long int __reserved2;	/* Reserved for ctime.nanoseconds.  */
     __blkcnt_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    int __pad2;
-#endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
-    int __pad3;
-    long __unused[6];
+    long int __unused[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -63,19 +56,22 @@ struct stat64
   {
     __dev_t st_dev;		/* Device.  */
     __ino64_t st_ino;		/* File serial number.  */
-    __mode_t st_mode;		/* File mode.  */
     __nlink_t st_nlink;		/* Link count.  */
+    __mode_t st_mode;		/* File mode.  */
     __uid_t st_uid;		/* User ID of the file's owner.	*/
     __gid_t st_gid;		/* Group ID of the file's group.*/
+    int pad0;
     __dev_t st_rdev;		/* Device number, if device.  */
     __off_t st_size;		/* Size of file, in bytes.  */
     __time_t st_atime;		/* Time of last access.  */
+    long int __reserved0;	/* Reserved for atime.nanoseconds.  */
     __time_t st_mtime;		/* Time of last modification.  */
+    long int __reserved1;	/* Reserved for mtime.nanoseconds.  */
     __time_t st_ctime;		/* Time of last status change.  */
+    long int __reserved2;	/* Reserved for ctime.nanoseconds.  */
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
-    int __pad3;
-    long __unused[6];
+    long int __unused[3];
   };
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/types.h b/sysdeps/unix/sysv/linux/ia64/bits/types.h
index a94c8a99ae..48ef3c1257 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/types.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/types.h
@@ -48,10 +48,10 @@ typedef __quad_t *__qaddr_t;
 typedef __uint64_t __dev_t;		/* Type of device numbers.  */
 typedef __uint32_t __uid_t;		/* Type of user identifications.  */
 typedef __uint32_t __gid_t;		/* Type of group identifications.  */
-typedef __uint32_t __ino_t;		/* Type of file serial numbers.  */
+typedef __uint64_t __ino_t;		/* Type of file serial numbers.  */
 typedef __uint64_t __ino64_t;		/*  "" (LFS) */
 typedef __uint32_t __mode_t;		/* Type of file attribute bitmasks.  */
-typedef __uint32_t __nlink_t; 		/* Type of file link counts.  */
+typedef __uint64_t __nlink_t; 		/* Type of file link counts.  */
 typedef __int64_t  __off_t;		/* Type of file sizes and offsets.  */
 typedef __int64_t  __off64_t;		/*  "" (LFS) */
 typedef __int64_t  __loff_t;		/* Type of file sizes and offsets.  */
@@ -59,11 +59,11 @@ typedef __int32_t  __pid_t;		/* Type of process identifications.  */
 typedef __int64_t  __ssize_t;		/* Type of a byte count, or error.  */
 typedef __uint64_t  __rlim_t;		/* Type of resource counts.  */
 typedef __uint64_t  __rlim64_t;		/*  "" (LFS) */
-typedef __int32_t  __blkcnt_t;		/* Type to count nr disk blocks.  */
+typedef __int64_t  __blkcnt_t;		/* Type to count nr disk blocks.  */
 typedef __int64_t  __blkcnt64_t;	/*  "" (LFS) */
-typedef __uint32_t __fsblkcnt_t;	/* Type to count file system blocks.  */
+typedef __uint64_t __fsblkcnt_t;	/* Type to count file system blocks.  */
 typedef __uint64_t __fsblkcnt64_t;	/*  "" (LFS) */
-typedef __uint32_t __fsfilcnt_t;	/* Type to count file system inodes.  */
+typedef __uint64_t __fsfilcnt_t;	/* Type to count file system inodes.  */
 typedef __uint64_t __fsfilcnt64_t;	/*  "" (LFS) */
 typedef __uint32_t __id_t;		/* General type for IDs.  */