diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-16 14:16:42 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-04-16 14:16:42 -0700 |
| commit | 8ecb4770a0a046e753e16d51d31371b827d20cf1 (patch) | |
| tree | 29a924ee55909059732fe9903ec809695ddd951d /libc/arch-x86/syscalls | |
| parent | 8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d (diff) | |
| parent | 6b8fd05414decfbbe46c8ce8e45ab8384594805e (diff) | |
| download | bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.zip bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.tar.gz bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.tar.bz2 | |
resolved conflicts for merge of 6b8fd054 to master
Change-Id: Ifc5a10d9c2f7764ad80d64cc552aad81d5fbf5eb
Diffstat (limited to 'libc/arch-x86/syscalls')
| -rw-r--r-- | libc/arch-x86/syscalls/getresgid.S | 9 | ||||
| -rw-r--r-- | libc/arch-x86/syscalls/getresuid.S | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libc/arch-x86/syscalls/getresgid.S b/libc/arch-x86/syscalls/getresgid.S index 454d32b..d43aec4 100644 --- a/libc/arch-x86/syscalls/getresgid.S +++ b/libc/arch-x86/syscalls/getresgid.S @@ -7,6 +7,12 @@ .align 4 getresgid: + pushl %ebx + pushl %ecx + pushl %edx + mov 16(%esp), %ebx + mov 20(%esp), %ecx + mov 24(%esp), %edx movl $__NR_getresgid32, %eax int $0x80 cmpl $-129, %eax @@ -17,4 +23,7 @@ getresgid: addl $4, %esp orl $-1, %eax 1: + popl %edx + popl %ecx + popl %ebx ret diff --git a/libc/arch-x86/syscalls/getresuid.S b/libc/arch-x86/syscalls/getresuid.S index f07b5c5..f489d40 100644 --- a/libc/arch-x86/syscalls/getresuid.S +++ b/libc/arch-x86/syscalls/getresuid.S @@ -7,6 +7,12 @@ .align 4 getresuid: + pushl %ebx + pushl %ecx + pushl %edx + mov 16(%esp), %ebx + mov 20(%esp), %ecx + mov 24(%esp), %edx movl $__NR_getresuid32, %eax int $0x80 cmpl $-129, %eax @@ -17,4 +23,7 @@ getresuid: addl $4, %esp orl $-1, %eax 1: + popl %edx + popl %ecx + popl %ebx ret |