From 0b6eb2dfb2e84a8a51906e7634f3d5edc230b058 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 21 Sep 2011 20:11:10 -0400
Subject: [PATCH] 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.
---
 arch/arm/bits/syscall.h     | 3 ++-
 arch/i386/bits/syscall.h    | 3 ++-
 arch/x86_64/bits/syscall.h  | 3 ++-
 src/fcntl/posix_fadvise.c   | 4 ++--
 src/fcntl/posix_fallocate.c | 4 ++--
 src/unistd/ftruncate.c      | 2 +-
 src/unistd/pread.c          | 2 +-
 src/unistd/pwrite.c         | 2 +-
 src/unistd/truncate.c       | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/arch/arm/bits/syscall.h b/arch/arm/bits/syscall.h
index 380ac3ca..b0379e02 100644
--- 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 88cd0d7d..8d673186 100644
--- 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 2339d2e5..5eeb8a69 100644
--- 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 75edafaf..21702097 100644
--- 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 d6680c14..bd726242 100644
--- 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 7ed69ff6..467135f0 100644
--- 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 1bf0c754..3d2799fd 100644
--- 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 224eacdd..bbe4c345 100644
--- 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 461f6de1..8e65655c 100644
--- 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);
-- 
2.25.1