finish moving 32-bit-specific junk out of source files.

diff --git a/arch/i386/syscall.h b/arch/i386/syscall.h
index 901263bae9c9f08a4959fd9430060cd1176b1d4e..114aa6880f6aa7fe3199196cc35d203712e8ce08 100644 (file)
--- a/arch/i386/syscall.h
+++ b/arch/i386/syscall.h
@@ -480,6 +480,29 @@ static inline long syscall6(long n, long a1, long a2, long a3, long a4, long a5,
 #define __NR_setfsgid __NR_setfsgid32
 
 
+/* fixup legacy 32-bit-vs-lfs64 junk */
+#undef __NR_getdents
+#undef __NR_ftruncate
+#undef __NR_truncate
+#undef __NR_stat
+#undef __NR_fstat
+#undef __NR_lstat
+#undef __NR_statfs
+#undef __NR_fstatfs
+#define __NR_getdents __NR_getdents64
+#define __NR_ftruncate __NR_ftruncate64
+#define __NR_truncate __NR_truncate64
+#define __NR_stat __NR_stat64
+#define __NR_fstat __NR_fstat64
+#define __NR_lstat __NR_lstat64
+#define __NR_statfs __NR_statfs64
+#define __NR_fstatfs __NR_fstatfs64
+#define __NR_fstatat __NR_fstatat64
+#define __NR_pread __NR_pread64
+#define __NR_pwrite __NR_pwrite64
+
+
+
 #undef O_LARGEFILE
 #define O_LARGEFILE 0100000
 

diff --git a/src/dirent/__getdents.c b/src/dirent/__getdents.c
index 4195430b636a3abec89ab8bd2917616a74095efe..dc373440b6e88db274398b50c05b09602abd1c62 100644 (file)
--- a/src/dirent/__getdents.c
+++ b/src/dirent/__getdents.c
@@ -4,7 +4,7 @@
 
 int __getdents(int fd, struct dirent *buf, size_t len)
 {
-       return syscall3(__NR_getdents64, fd, (long)buf, len);
+       return syscall3(__NR_getdents, fd, (long)buf, len);
 }
 
 weak_alias(__getdents, getdents);

diff --git a/src/stat/fstat.c b/src/stat/fstat.c
index 5f6433014d68d55a29c41ed5aadcb0b7aa18b82d..88ac6f3c5a120d9dd75245a1fbdbc941687697a9 100644 (file)
--- a/src/stat/fstat.c
+++ b/src/stat/fstat.c
@@ -4,7 +4,7 @@
 
 int fstat(int fd, struct stat *buf)
 {
-       return syscall2(__NR_fstat64, fd, (long)buf);
+       return syscall2(__NR_fstat, fd, (long)buf);
 }
 
 LFS64(fstat);

diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c
index 22bc2934167cdc1f422489c1948cc22588b7c3d6..e39f833bbd37799fa37e7980c383bd3c73b7f306 100644 (file)
--- a/src/stat/fstatat.c
+++ b/src/stat/fstatat.c
@@ -4,7 +4,7 @@
 
 int fstatat(int fd, const char *path, struct stat *buf, int flag)
 {
-       return syscall4(__NR_fstatat64, fd, (long)path, (long)buf, flag);
+       return syscall4(__NR_fstatat, fd, (long)path, (long)buf, flag);
 }
 
 LFS64(fstatat);

diff --git a/src/stat/fstatvfs.c b/src/stat/fstatvfs.c
index 83bd748688f5657f67306c5cb930c665f8d34140..4a8bfe2e1ea1238be352c6244ca981629a3b6d46 100644 (file)
--- a/src/stat/fstatvfs.c
+++ b/src/stat/fstatvfs.c
@@ -4,7 +4,7 @@
 
 int fstatvfs(int fd, struct statvfs *buf)
 {
-       return syscall2(__NR_fstatfs64, fd, (long)buf);
+       return syscall2(__NR_fstatfs, fd, (long)buf);
 }
 
 weak_alias(fstatvfs, fstatfs);

diff --git a/src/stat/lstat.c b/src/stat/lstat.c
index afdb553841ec1106bcccb0f0c90ce16268196649..3b22e620bd21399def24bf2ae70febf12a1a2b3e 100644 (file)
--- a/src/stat/lstat.c
+++ b/src/stat/lstat.c
@@ -4,7 +4,7 @@
 
 int lstat(const char *path, struct stat *buf)
 {
-       return syscall2(__NR_lstat64, (long)path, (long)buf);
+       return syscall2(__NR_lstat, (long)path, (long)buf);
 }
 
 LFS64(lstat);

diff --git a/src/stat/stat.c b/src/stat/stat.c
index 67640cc1589a591759248971c58cbc4776006d2d..9847552afddf29e2f590f8fe43d5a5bb30ac7f43 100644 (file)
--- a/src/stat/stat.c
+++ b/src/stat/stat.c
@@ -4,7 +4,7 @@
 
 int stat(const char *path, struct stat *buf)
 {
-       return syscall2(__NR_stat64, (long)path, (long)buf);
+       return syscall2(__NR_stat, (long)path, (long)buf);
 }
 
 LFS64(stat);

diff --git a/src/stat/statvfs.c b/src/stat/statvfs.c
index 55a05d528d0c53a603509e92ee7425a133a1963a..ebf14b43515a6c02f77fb62e3e5cfd164bf0889f 100644 (file)
--- a/src/stat/statvfs.c
+++ b/src/stat/statvfs.c
@@ -4,7 +4,7 @@
 
 int statvfs(const char *path, struct statvfs *buf)
 {
-       return syscall2(__NR_statfs64, (long)path, (long)buf);
+       return syscall2(__NR_statfs, (long)path, (long)buf);
 }
 
 weak_alias(statvfs, statfs);

diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c
index e0b2f4bb4c198c15ac2e52401c985d0c9152152b..db5da84470897aa58148140b1e0e46620ba53eba 100644 (file)
--- a/src/unistd/ftruncate.c
+++ b/src/unistd/ftruncate.c
@@ -4,12 +4,7 @@
 
 int ftruncate(int fd, off_t length)
 {
-       if (sizeof(long) == 8)
-               return syscall2(__NR_ftruncate, fd, length);
-       else {
-               union { long long ll; long l[2]; } u = { length };
-               return syscall3(__NR_ftruncate64, fd, u.l[0], u.l[1]);
-       }
+       return syscall3(__NR_ftruncate, fd, SYSCALL_LL(length));
 }
 
 LFS64(ftruncate);

diff --git a/src/unistd/pread.c b/src/unistd/pread.c
index 029ba3d14012ca88e195e08cd0810512fdc71cd3..534215acf31b986fe36ec1445469021b60818428 100644 (file)
--- a/src/unistd/pread.c
+++ b/src/unistd/pread.c
@@ -6,7 +6,7 @@ ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
 {
        ssize_t r;
        CANCELPT_BEGIN;
-       r = syscall5(__NR_pread64, fd, (long)buf, size, SYSCALL_LL(ofs));
+       r = syscall5(__NR_pread, fd, (long)buf, size, SYSCALL_LL(ofs));
        CANCELPT_END;
        return r;
 }

diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
index 8f23d1b9b11caf7a3ff3c16dc898da0b7de46237..56ed6b4c47d71c8a144398f19fa03b25ba948596 100644 (file)
--- a/src/unistd/pwrite.c
+++ b/src/unistd/pwrite.c
@@ -6,7 +6,7 @@ ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
 {
        ssize_t r;
        CANCELPT_BEGIN;
-       r = syscall5(__NR_pwrite64, fd, (long)buf, size, SYSCALL_LL(ofs));
+       r = syscall5(__NR_pwrite, fd, (long)buf, size, SYSCALL_LL(ofs));
        CANCELPT_END;
        return r;
 }

diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c
index f75e824e614c9c6142fd3d5243b0a890a3d2dc0a..322349d2aeebe0e38a512334f3f51f710d7c1fc8 100644 (file)
--- a/src/unistd/truncate.c
+++ b/src/unistd/truncate.c
@@ -4,12 +4,7 @@
 
 int truncate(const char *path, off_t length)
 {
-       if (sizeof(long) == 8)
-               return syscall2(__NR_truncate, (long)path, length);
-       else {
-               union { long long ll; long l[2]; } u = { length };
-               return syscall3(__NR_truncate64, (long)path, u.l[0], u.l[1]);
-       }
+       return syscall3(__NR_truncate, (long)path, SYSCALL_LL(length));
 }
 
 LFS64(truncate);