diff options
| author | Sreeram Ramachandran <sreeram@google.com> | 2014-05-19 13:39:57 -0700 |
|---|---|---|
| committer | Sreeram Ramachandran <sreeram@google.com> | 2014-05-19 15:19:16 -0700 |
| commit | 903b78873a744d3fba187e4bd22008ba21162e51 (patch) | |
| tree | 54927c30d730513d9cfa817448b3184a6b6531ee /libc/arch-x86 | |
| parent | 172ab0f65035013565ec57f52ece663082683698 (diff) | |
| download | bionic-903b78873a744d3fba187e4bd22008ba21162e51.zip bionic-903b78873a744d3fba187e4bd22008ba21162e51.tar.gz bionic-903b78873a744d3fba187e4bd22008ba21162e51.tar.bz2 | |
Mark sockets on creation (socket()) and accept4().
Remove the separate syscall for accept() and implement it as accept4(..., 0).
Change-Id: Ib0b8f5d7c5013b91eae6bbc3847852eb355c7714
Diffstat (limited to 'libc/arch-x86')
| -rw-r--r-- | libc/arch-x86/syscalls/__accept.S | 27 | ||||
| -rw-r--r-- | libc/arch-x86/syscalls/__accept4.S (renamed from libc/arch-x86/syscalls/accept4.S) | 4 | ||||
| -rw-r--r-- | libc/arch-x86/syscalls/__socket.S (renamed from libc/arch-x86/syscalls/socket.S) | 4 |
3 files changed, 4 insertions, 31 deletions
diff --git a/libc/arch-x86/syscalls/__accept.S b/libc/arch-x86/syscalls/__accept.S deleted file mode 100644 index 31cb350..0000000 --- a/libc/arch-x86/syscalls/__accept.S +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include <private/bionic_asm.h> - -ENTRY(__accept) - pushl %ebx - pushl %ecx - .cfi_def_cfa_offset 8 - .cfi_rel_offset ebx, 0 - .cfi_rel_offset ecx, 4 - mov $5, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret -END(__accept) diff --git a/libc/arch-x86/syscalls/accept4.S b/libc/arch-x86/syscalls/__accept4.S index dc3c1f5..573eddb 100644 --- a/libc/arch-x86/syscalls/accept4.S +++ b/libc/arch-x86/syscalls/__accept4.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(accept4) +ENTRY(__accept4) pushl %ebx pushl %ecx .cfi_def_cfa_offset 8 @@ -24,4 +24,4 @@ ENTRY(accept4) popl %ecx popl %ebx ret -END(accept4) +END(__accept4) diff --git a/libc/arch-x86/syscalls/socket.S b/libc/arch-x86/syscalls/__socket.S index 282681e..5e52d8f 100644 --- a/libc/arch-x86/syscalls/socket.S +++ b/libc/arch-x86/syscalls/__socket.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(socket) +ENTRY(__socket) pushl %ebx pushl %ecx .cfi_def_cfa_offset 8 @@ -24,4 +24,4 @@ ENTRY(socket) popl %ecx popl %ebx ret -END(socket) +END(__socket) |