Fix for x64. __unused is #defined elsewhere.
Recent versions of NDK do not define __off64_t, changed to int64_t.
BUG=346626
R=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/219483003
git-svn-id: http://linux-syscall-support.googlecode.com/svn/trunk/lss@25 829466d3-f3f5-3ae4-62ad-de35cf9bba21
diff --git a/linux_syscall_support.h b/linux_syscall_support.h
index d04901d..1ca17fd 100644
--- a/linux_syscall_support.h
+++ b/linux_syscall_support.h
@@ -426,7 +426,7 @@
uint64_t st_mtime_nsec_;
uint64_t st_ctime_;
uint64_t st_ctime_nsec_;
- int64_t __unused[3];
+ int64_t __unused4[3];
};
#elif defined(__PPC__)
struct kernel_stat {
@@ -2241,9 +2241,9 @@
__asm__ __volatile__(/* if (fn == NULL || child_stack == NULL)
* return -EINVAL;
*/
-#ifdef __thumb2__
+#ifdef __thumb2__
"push {r7}\n"
-#endif
+#endif
"cmp %2,#0\n"
"it ne\n"
"cmpne %3,#0\n"
@@ -2301,7 +2301,7 @@
"1:\n"
#ifdef __thumb2__
"pop {r7}"
-#endif
+#endif
: "=r" (__res)
: "i"(-EINVAL),
"r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
@@ -2930,7 +2930,7 @@
/* Need to make sure __off64_t isn't truncated to 32-bits under x32. */
LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
- __off64_t o) {
+ int64_t o) {
LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l),
LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f),
LSS_SYSCALL_ARG(d), (uint64_t)(o));