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 380ac3cacea5a69125ad240adcf7557238aba86a..b0379e02496b2ef72851740ab8bc4afb5d4e7e38 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]
+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
 long (__syscall)(long, ...);
 

diff --git a/arch/i386/bits/syscall.h b/arch/i386/bits/syscall.h
index 88cd0d7d5c8a9ecb69fb60d271b1e43a5a4a27b2..8d6731861793af1f11fffd71300c20ded934af71 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]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
 
 static inline long __syscall0(long __n)
 {

diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h
index 2339d2e5245fa7f9ad48615c0f77bf80a105582c..5eeb8a69edd5ef89989408a01f601139a4215c7e 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)
 {

diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c
index 75edafaf614a8f22307c0c9445b4d44ce39b487f..21702097ceedfb4305fd7da719ac87537164e797 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)
 {
-       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 d6680c142c35ba51159ad767a155a898dd836503..bd726242d325a461d66ad505e57f5db5f5ca7351 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)
 {
-       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 7ed69ff65e9d915c11bb4f26be55144b020eab19..467135f009971316101b6e38e5384707baa508c4 100644 (file)
--- a/src/unistd/ftruncate.c
+++ b/src/unistd/ftruncate.c
@@ -4,7 +4,7 @@
 
 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);

diff --git a/src/unistd/pread.c b/src/unistd/pread.c
index 1bf0c754bd0cb8cd5a51ec1f06504138be5a28ac..3d2799fdd49dfec3a2a4d2d5896b8ab06fef3f27 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)
 {
-       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);

diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
index 224eacdd6df01c9ab9ebc0a7965ba20ddc12bf6d..bbe4c345dcbe4a5ca5eb15db0358d331301cb665 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)
 {
-       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);

diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c
index 461f6de1a0f10c1278cdaff33017696c3209993c..8e65655cd2bd1347af21edee8318f4aba92678c9 100644 (file)
--- a/src/unistd/truncate.c
+++ b/src/unistd/truncate.c
@@ -4,7 +4,7 @@
 
 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);