generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c606294b: am 3721a7e7: am 7115c802: Merge "Fix pread/pwrite for LP64."

Browse Source 
* commit 'c606294b9397930a18d9c153186b77ece819588c':
  Fix pread/pwrite for LP64.
This commit is contained in:
Elliott Hughes 2013-11-06 16:15:45 -08:00 committed by Android Git Automerger
commit 7406433662
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/Android.mk
View File

@ -107,11 +107,9 @@ libc_common_src_files := \
bionic/name_mem.c \ bionic/name_mem.c \
bionic/pathconf.c \ bionic/pathconf.c \
bionic/perror.c \ bionic/perror.c \
bionic/pread.c \
bionic/ptsname.c \ bionic/ptsname.c \
bionic/ptsname_r.c \ bionic/ptsname_r.c \
bionic/pututline.c \ bionic/pututline.c \
bionic/pwrite.c \
bionic/reboot.c \ bionic/reboot.c \
bionic/recv.c \ bionic/recv.c \
bionic/sched_cpualloc.c \ bionic/sched_cpualloc.c \
@ -181,6 +179,8 @@ libc_common_src_files += \
bionic/__get_tls.cpp \ bionic/__get_tls.cpp \
bionic/lseek64.c \ bionic/lseek64.c \
bionic/ndk_cruft.cpp \ bionic/ndk_cruft.cpp \
bionic/pread.c \
bionic/pwrite.c \
bionic/statfs.c \ bionic/statfs.c \
endif endif

6
libc/SYSCALLS.TXT
View File

@ -88,8 +88,10 @@ int acct(const char* filepath) all
# file descriptors # file descriptors
ssize_t read(int, void*, size_t) all ssize_t read(int, void*, size_t) all
ssize_t write(int, const void*, size_t) all ssize_t write(int, const void*, size_t) all
ssize_t pread64(int, void*, size_t, off64_t) all ssize_t pread64(int, void*, size_t, off64_t) arm,mips,x86
ssize_t pwrite64(int, void*, size_t, off64_t) all ssize_t pread64|pread(int, void*, size_t, off_t) aarch64,x86_64
ssize_t pwrite64(int, void*, size_t, off64_t) arm,mips,x86
ssize_t pwrite64|pwrite(int, void*, size_t, off_t) aarch64,x86_64
int close(int) all int close(int) all
pid_t getpid() all pid_t getpid() all
void* mmap(void*, size_t, int, int, int, long) aarch64,x86_64 void* mmap(void*, size_t, int, int, int, long) aarch64,x86_64

3
libc/arch-aarch64/syscalls/pread64.S
View File

@ -21,3 +21,6 @@ ENTRY(pread64)
ret ret
END(pread64) END(pread64)
.globl _C_LABEL(pread)
.equ _C_LABEL(pread), _C_LABEL(pread64)

3
libc/arch-aarch64/syscalls/pwrite64.S
View File

@ -21,3 +21,6 @@ ENTRY(pwrite64)
ret ret
END(pwrite64) END(pwrite64)
.globl _C_LABEL(pwrite)
.equ _C_LABEL(pwrite), _C_LABEL(pwrite64)

3
libc/arch-x86_64/syscalls/pread64.S
View File

@ -17,3 +17,6 @@ ENTRY(pread64)
1: 1:
ret ret
END(pread64) END(pread64)
.globl _C_LABEL(pread)
.equ _C_LABEL(pread), _C_LABEL(pread64)

3
libc/arch-x86_64/syscalls/pwrite64.S
View File

@ -17,3 +17,6 @@ ENTRY(pwrite64)
1: 1:
ret ret
END(pwrite64) END(pwrite64)
.globl _C_LABEL(pwrite)
.equ _C_LABEL(pwrite), _C_LABEL(pwrite64)