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

resolved conflicts for merge of ef987656 to master

Browse Source 
Change-Id: I3854de8f4cddaf344444efa6f9da027642a237d9
This commit is contained in:
Elliott Hughes 2012-04-16 14:26:43 -07:00
commit f848321c4f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/SYSCALLS.TXT
View File

@ -183,7 +183,7 @@ int nanosleep(const struct timespec *, struct timespec *) 162
int clock_gettime(clockid_t clk_id, struct timespec *tp) 263,265 int clock_gettime(clockid_t clk_id, struct timespec *tp) 263,265
int clock_settime(clockid_t clk_id, const struct timespec *tp) 262,264 int clock_settime(clockid_t clk_id, const struct timespec *tp) 262,264
int clock_getres(clockid_t clk_id, struct timespec *res) 264,266 int clock_getres(clockid_t clk_id, struct timespec *res) 264,266
int clock_nanosleep(const struct timespec *req, struct timespec *rem) 265,267 int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *req, struct timespec *rem) 265,267
int getitimer(int, const struct itimerval *) 105 int getitimer(int, const struct itimerval *) 105
int setitimer(int, const struct itimerval *, struct itimerval *) 104 int setitimer(int, const struct itimerval *, struct itimerval *) 104
int __timer_create:timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid) 257,259 int __timer_create:timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid) 257,259

10
libc/arch-x86/syscalls/clock_nanosleep.S
View File

@ -9,8 +9,12 @@
clock_nanosleep: clock_nanosleep:
pushl %ebx pushl %ebx
pushl %ecx pushl %ecx
mov 12(%esp), %ebx pushl %edx
mov 16(%esp), %ecx pushl %esi
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
mov 32(%esp), %esi
movl $__NR_clock_nanosleep, %eax movl $__NR_clock_nanosleep, %eax
int $0x80 int $0x80
cmpl $-129, %eax cmpl $-129, %eax
@ -21,6 +25,8 @@ clock_nanosleep:
addl $4, %esp addl $4, %esp
orl $-1, %eax orl $-1, %eax
1: 1:
popl %esi
popl %edx
popl %ecx popl %ecx
popl %ebx popl %ebx
ret ret