Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: linux_syscall_support.h

Issue 1743093002: Fix usage with musl libc. Base URL: https://chromium.googlesource.com/linux-syscall-support@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: linux_syscall_support.h
diff --git a/linux_syscall_support.h b/linux_syscall_support.h
index 8a42c1c8687b2af252811c28581cabfd89a3a3ae..85a6245eaf2df7bd0e1f642e37eac17fe47236e5 100644
--- a/linux_syscall_support.h
+++ b/linux_syscall_support.h
@@ -1842,8 +1842,8 @@ struct kernel_statfs {
unsigned, len_lo, unsigned, len_hi,
int, advice)
- LSS_INLINE int LSS_NAME(fadvise64)(int fd, loff_t offset,
- loff_t len, int advice) {
+ LSS_INLINE int LSS_NAME(fadvise64)(int fd, int64_t offset,
+ int64_t len, int advice) {
return LSS_NAME(_fadvise64_64)(fd,
(unsigned)offset, (unsigned)(offset >>32),
(unsigned)len, (unsigned)(len >> 32),
@@ -1857,8 +1857,8 @@ struct kernel_statfs {
unsigned, len_lo, unsigned, len_hi)
LSS_INLINE int LSS_NAME(fallocate)(int fd, int mode,
- loff_t offset, loff_t len) {
- union { loff_t off; unsigned w[2]; } o = { offset }, l = { len };
+ int64_t offset, int64_t len) {
+ union { int64_t off; unsigned w[2]; } o = { offset }, l = { len };
return LSS_NAME(_fallocate)(fd, mode, o.w[0], o.w[1], l.w[0], l.w[1]);
}
@@ -2149,8 +2149,8 @@ struct kernel_statfs {
}
LSS_INLINE _syscall2(int, arch_prctl, int, c, void *, a)
- /* Need to make sure loff_t isn't truncated to 32-bits under x32. */
- LSS_INLINE int LSS_NAME(fadvise64)(int fd, loff_t offset, loff_t len,
+ /* Need to make sure int_t isn't truncated to 32-bits under x32. */
+ LSS_INLINE int LSS_NAME(fadvise64)(int fd, int64_t offset, int64_t len,
int advice) {
LSS_BODY(4, int, fadvise64, LSS_SYSCALL_ARG(fd), (uint64_t)(offset),
(uint64_t)(len), LSS_SYSCALL_ARG(advice));
@@ -3191,9 +3191,9 @@ struct kernel_statfs {
int, t, int, p, int*, s)
#endif
#if defined(__x86_64__)
- /* Need to make sure loff_t isn't truncated to 32-bits under x32. */
- LSS_INLINE int LSS_NAME(fallocate)(int f, int mode, loff_t offset,
- loff_t len) {
+ /* Need to make sure int64_t isn't truncated to 32-bits under x32. */
+ LSS_INLINE int LSS_NAME(fallocate)(int f, int mode, int64_t offset,
+ int64_t len) {
LSS_BODY(4, int, fallocate, LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(mode),
(uint64_t)(offset), (uint64_t)(len));
}
@@ -3453,7 +3453,7 @@ struct kernel_statfs {
struct kernel_stat64 *, b)
LSS_INLINE _syscall5(int, _llseek, uint, fd,
unsigned long, hi, unsigned long, lo,
- loff_t *, res, uint, wh)
+ int64_t *, res, uint, wh)
#if !defined(__ARM_EABI__)
LSS_INLINE _syscall1(void*, mmap, void*, a)
#endif
@@ -3862,31 +3862,31 @@ struct kernel_statfs {
}
}
#if defined(__x86_64__)
- /* Need to make sure loff_t isn't truncated to 32-bits under x32. */
- LSS_INLINE ssize_t LSS_NAME(pread64)(int f, void *b, size_t c, loff_t o) {
+ /* Need to make sure int64_t isn't truncated to 32-bits under x32. */
+ LSS_INLINE ssize_t LSS_NAME(pread64)(int f, void *b, size_t c, int64_t o) {
LSS_BODY(4, ssize_t, pread64, LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(b),
LSS_SYSCALL_ARG(c), (uint64_t)(o));
}
LSS_INLINE ssize_t LSS_NAME(pwrite64)(int f, const void *b, size_t c,
- loff_t o) {
+ int64_t o) {
LSS_BODY(4, ssize_t, pwrite64, LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(b),
LSS_SYSCALL_ARG(c), (uint64_t)(o));
}
- LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, unsigned c) {
+ LSS_INLINE int LSS_NAME(readahead)(int f, int64_t o, unsigned c) {
LSS_BODY(3, int, readahead, LSS_SYSCALL_ARG(f), (uint64_t)(o),
LSS_SYSCALL_ARG(c));
}
#elif defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI64
LSS_INLINE _syscall4(ssize_t, pread64, int, f,
void *, b, size_t, c,
- loff_t, o)
+ int64_t, o)
LSS_INLINE _syscall4(ssize_t, pwrite64, int, f,
const void *, b, size_t, c,
- loff_t, o)
+ int64_t, o)
LSS_INLINE _syscall3(int, readahead, int, f,
- loff_t, o, unsigned, c)
+ int64_t, o, unsigned, c)
LSS_INLINE _syscall6(void *, mmap, void *, addr, size_t, length, int, prot,
int, flags, int, fd, int64_t, offset)
#else
@@ -3925,19 +3925,19 @@ struct kernel_statfs {
* underlying architecture.
*/
LSS_INLINE ssize_t LSS_NAME(pread64)(int fd, void *buf, size_t count,
- loff_t off) {
- union { loff_t off; unsigned arg[2]; } o = { off };
+ int64_t off) {
+ union { int64_t off; unsigned arg[2]; } o = { off };
return LSS_NAME(_pread64)(fd, buf, count,
LSS_LLARG_PAD o.arg[0], o.arg[1]);
}
LSS_INLINE ssize_t LSS_NAME(pwrite64)(int fd, const void *buf,
- size_t count, loff_t off) {
- union { loff_t off; unsigned arg[2]; } o = { off };
+ size_t count, int64_t off) {
+ union { int64_t off; unsigned arg[2]; } o = { off };
return LSS_NAME(_pwrite64)(fd, buf, count,
LSS_LLARG_PAD o.arg[0], o.arg[1]);
}
- LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, int len) {
- union { loff_t off; unsigned arg[2]; } o = { off };
+ LSS_INLINE int LSS_NAME(readahead)(int fd, int64_t off, int len) {
+ union { int64_t off; unsigned arg[2]; } o = { off };
return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], len);
}
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698