update syscalls with off_t arguments to handle argument alignment, if needed

the arm syscall abi requires 64-bit arguments to be aligned on an even
register boundary. these new macros facilitate meeting the abi
requirement without imposing significant ugliness on the code.

diff --git a/arch/arm/bits/syscall.h b/arch/arm/bits/syscall.h
index 380ac3c..b0379e0 100644 (file)
--- a/arch/arm/bits/syscall.h
+++ b/arch/arm/bits/syscall.h
@@ -1,6 +1,7 @@
-#define __SYSCALL_LL(x) \
+#define __SYSCALL_LL_E(x) \

 ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]

+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))

 
 long (__syscall)(long, ...);
 
 
 long (__syscall)(long, ...);
 

diff --git a/arch/i386/bits/syscall.h b/arch/i386/bits/syscall.h
index 88cd0d7..8d67318 100644 (file)
--- a/arch/i386/bits/syscall.h
+++ b/arch/i386/bits/syscall.h
@@ -1,6 +1,7 @@
-#define __SYSCALL_LL(x) \
+#define __SYSCALL_LL_E(x) \

 ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]

+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))

 
 static inline long __syscall0(long __n)
 {
 
 static inline long __syscall0(long __n)
 {

diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h
index 2339d2e..5eeb8a6 100644 (file)
--- a/arch/x86_64/bits/syscall.h
+++ b/arch/x86_64/bits/syscall.h
@@ -1,4 +1,5 @@
-#define __SYSCALL_LL(x) (x)
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)

 
 static inline long __syscall0(long __n)
 {
 
 static inline long __syscall0(long __n)
 {

diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c
index 75edafa..2170209 100644 (file)
--- a/src/fcntl/posix_fadvise.c
+++ b/src/fcntl/posix_fadvise.c
@@ -3,6 +3,6 @@
 
 int posix_fadvise(int fd, off_t base, off_t len, int advice)
 {
 
 int posix_fadvise(int fd, off_t base, off_t len, int advice)
 {

-       return -__syscall(SYS_fadvise, fd, __SYSCALL_LL(base),
-               __SYSCALL_LL(len), advice);
+       return -(__syscall)(SYS_fadvise, fd, __SYSCALL_LL_O(base),
+               __SYSCALL_LL_E(len), advice);

 }
 }

diff --git a/src/fcntl/posix_fallocate.c b/src/fcntl/posix_fallocate.c
index d6680c1..bd72624 100644 (file)
--- a/src/fcntl/posix_fallocate.c
+++ b/src/fcntl/posix_fallocate.c
@@ -3,6 +3,6 @@
 
 int posix_fallocate(int fd, off_t base, off_t len)
 {
 
 int posix_fallocate(int fd, off_t base, off_t len)
 {

-       return -__syscall(SYS_fallocate, fd, __SYSCALL_LL(base),
-               __SYSCALL_LL(len));
+       return -__syscall(SYS_fallocate, fd, __SYSCALL_LL_O(base),
+               __SYSCALL_LL_E(len));

 }
 }

diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c
index 7ed69ff..467135f 100644 (file)
--- a/src/unistd/ftruncate.c
+++ b/src/unistd/ftruncate.c
@@ -4,7 +4,7 @@
 
 int ftruncate(int fd, off_t length)
 {
 
 int ftruncate(int fd, off_t length)
 {

-       return syscall(SYS_ftruncate, fd, __SYSCALL_LL(length));
+       return syscall(SYS_ftruncate, fd, __SYSCALL_LL_O(length));

 }
 
 LFS64(ftruncate);
 }
 
 LFS64(ftruncate);

diff --git a/src/unistd/pread.c b/src/unistd/pread.c
index 1bf0c75..3d2799f 100644 (file)
--- a/src/unistd/pread.c
+++ b/src/unistd/pread.c
@@ -4,7 +4,7 @@
 
 ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
 {
 
 ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
 {

-       return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL(ofs));
+       return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_O(ofs));

 }
 
 LFS64(pread);
 }
 
 LFS64(pread);

diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
index 224eacd..bbe4c34 100644 (file)
--- a/src/unistd/pwrite.c
+++ b/src/unistd/pwrite.c
@@ -4,7 +4,7 @@
 
 ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
 {
 
 ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
 {

-       return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL(ofs));
+       return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_O(ofs));

 }
 
 LFS64(pwrite);
 }
 
 LFS64(pwrite);

diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c
index 461f6de..8e65655 100644 (file)
--- a/src/unistd/truncate.c
+++ b/src/unistd/truncate.c
@@ -4,7 +4,7 @@
 
 int truncate(const char *path, off_t length)
 {
 
 int truncate(const char *path, off_t length)
 {

-       return syscall(SYS_truncate, path, __SYSCALL_LL(length));
+       return syscall(SYS_truncate, path, __SYSCALL_LL_O(length));

 }
 
 LFS64(truncate);
 }
 
 LFS64(truncate);