|
@@ -9,30 +9,24 @@
|
|
|
|
|
|
#include <_lfs_64.h>
|
|
#include <_lfs_64.h>
|
|
#include <sys/syscall.h>
|
|
#include <sys/syscall.h>
|
|
-#include <unistd.h>
|
|
|
|
-#include <stdint.h>
|
|
|
|
|
|
+#include <bits/wordsize.h>
|
|
|
|
|
|
/* Newer kernel ports have llseek() instead of _llseek() */
|
|
/* Newer kernel ports have llseek() instead of _llseek() */
|
|
#if !defined __NR__llseek && defined __NR_llseek
|
|
#if !defined __NR__llseek && defined __NR_llseek
|
|
# define __NR__llseek __NR_llseek
|
|
# define __NR__llseek __NR_llseek
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef __NR__llseek
|
|
|
|
-off64_t lseek64(int fd, off64_t offset, int whence)
|
|
|
|
|
|
+#if defined __NR__llseek && __WORDSIZE == 32
|
|
|
|
+# include <unistd.h>
|
|
|
|
+# include <endian.h>
|
|
|
|
+# include <cancel.h>
|
|
|
|
+off64_t __NC(lseek64)(int fd, off64_t offset, int whence)
|
|
{
|
|
{
|
|
off64_t result;
|
|
off64_t result;
|
|
- return (off64_t)INLINE_SYSCALL(_llseek, 5, fd, (off_t) (offset >> 32),
|
|
|
|
- (off_t) (offset & 0xffffffff), &result, whence) ?: result;
|
|
|
|
|
|
+ /* do we not need to handle the offset with __LONG_LONG_PAIR depending on endianness? */
|
|
|
|
+ return (off64_t)INLINE_SYSCALL(_llseek, 5, fd, (off_t) OFF64_HI(offset),
|
|
|
|
+ (off_t) OFF64_LO(offset), &result, whence) ?: result;
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-off64_t lseek64(int fd, off64_t offset, int whence)
|
|
|
|
-{
|
|
|
|
- return (off64_t)lseek(fd, (off_t) (offset), whence);
|
|
|
|
-}
|
|
|
|
-#endif
|
|
|
|
-#ifndef __LINUXTHREADS_OLD__
|
|
|
|
-libc_hidden_def(lseek64)
|
|
|
|
-#else
|
|
|
|
-libc_hidden_weak(lseek64)
|
|
|
|
-strong_alias(lseek64,__libc_lseek64)
|
|
|
|
|
|
+CANCELLABLE_SYSCALL(off64_t, lseek64, (int fd, off64_t offset, int whence), (fd, offset, whence))
|
|
|
|
+lt_libc_hidden(lseek64)
|
|
#endif
|
|
#endif
|