diff options
| author | Roland McGrath <roland@gnu.org> | 2006-03-06 01:34:09 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2006-03-06 01:34:09 +0000 |
| commit | 043cee3700d01624d694d8e1afc76a666309f89c (patch) | |
| tree | aa2f8a2b421429ca84eba888fefd946df6e3d669 /sysdeps/unix/sysv/linux/sparc/sparc64/socket.S | |
| parent | a26c855c73bf2329496f9b74535045c22c92a12d (diff) | |
| download | glibc-043cee3700d01624d694d8e1afc76a666309f89c.tar.gz glibc-043cee3700d01624d694d8e1afc76a666309f89c.tar.xz glibc-043cee3700d01624d694d8e1afc76a666309f89c.zip | |
* shlib-versions: Use sparc64.*- for CPU patterns.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc/sparc64/socket.S')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/socket.S | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S b/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S index 7a8b205538..353705b4ac 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S @@ -47,8 +47,8 @@ # endif #endif -.globl __socket -ENTRY (__socket) + .globl __syscall_error +ENTRY(__socket) /* Drop up to 6 arguments (recvfrom) into the memory allocated by the caller for varargs, since that's really what we have. */ @@ -77,14 +77,15 @@ ENTRY (__socket) LOADSYSCALL(socketcall) ta 0x6d - bcs,pn %xcc, __syscall_error_handler - nop - retl + bcc,pt %xcc, 1f + mov %o7, %g1 + call __syscall_error + mov %g1, %o7 +1: retl nop #if defined NEED_CANCELLATION && defined CENABLE .Lsocket_cancel: - cfi_startproc save %sp, -160, %sp cfi_def_cfa_register (%fp) cfi_window_save @@ -97,19 +98,21 @@ ENTRY (__socket) LOADSYSCALL(socketcall) ta 0x6d - bcs,pn %xcc, __syscall_error_handler2 + bcc,pt %xcc, 1f mov %o0, %l1 - CDISABLE + CDISABLE; + mov %l0, %o0; + call __syscall_error; + mov %l1, %o0; + ba,pt %xcc, 2f + mov -1, %l1; +1: CDISABLE mov %l0, %o0 - jmpl %i7 + 8, %g0 +2: jmpl %i7 + 8, %g0 restore %g0, %l1, %o0 - cfi_endproc - SYSCALL_ERROR_HANDLER2 #endif - SYSCALL_ERROR_HANDLER - -END (__socket) +END(__socket) #ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) |