getservbyport_r: fix wrong result if getnameinfo fails with EAI_OVERFLOW

[musl] / src / thread / mips / syscall_cp.s

diff --git a/src/thread/mips/syscall_cp.s b/src/thread/mips/syscall_cp.s
index 9a796bd..d284626 100644 (file)
--- a/src/thread/mips/syscall_cp.s
+++ b/src/thread/mips/syscall_cp.s
@@ -1,31 +1,53 @@
 .set    noreorder
 
+.global __cp_begin
+.hidden __cp_begin
+.type   __cp_begin,@function
+.global __cp_end
+.hidden __cp_end
+.type   __cp_end,@function
+.global __cp_cancel
+.hidden __cp_cancel
+.type   __cp_cancel,@function
+.hidden __cancel
 .global __syscall_cp_asm
+.hidden __syscall_cp_asm
 .type   __syscall_cp_asm,@function
 __syscall_cp_asm:
-.global __cp_begin
+       subu    $sp, $sp, 32
 __cp_begin:
        lw      $4, 0($4)
-       bne     $4, $0, 2f
-       move    $10, $5
+       bne     $4, $0, __cp_cancel
+       move    $2, $5
        move    $4, $6
        move    $5, $7
-       lw      $6, 16($sp)
-       lw      $7, 20($sp)
-       lw      $8, 24($sp)
-       lw      $9, 28($sp)
-       subu    $sp, $sp, 32
+       lw      $6, 48($sp)
+       lw      $7, 52($sp)
+       lw      $8, 56($sp)
+       lw      $9, 60($sp)
+       lw      $10,64($sp)
        sw      $8, 16($sp)
        sw      $9, 20($sp)
-       move    $2, $10
+       sw      $10,24($sp)
+       sw      $2, 28($sp)
+       lw      $2, 28($sp)
        syscall
-.global __cp_end
 __cp_end:
        beq     $7, $0, 1f
        addu    $sp, $sp, 32
        subu    $2, $0, $2
 1:     jr      $ra
        nop
-2:     lw      $25, %call16(__cancel)($gp)
+
+__cp_cancel:
+       move    $2, $ra
+       bal     1f
+       addu    $sp, $sp, 32
+       .gpword .
+       .gpword __cancel
+1:     lw      $3, ($ra)
+       subu    $3, $ra, $3
+       lw      $25, 4($ra)
+       addu    $25, $25, $3
        jr      $25
-       nop
+       move    $ra, $2