浏览代码

Fix MIPS syscall() and pipe functions to set errno correctly as reported by Daniel Jacobowitz on the mailing list. More information available at <http://www.uclibc.org/lists/uclibc/2007-May/017968.html> .

"Steven J. Hill" 18 年之前
父节点
当前提交
58c5f8ba4c
共有 2 个文件被更改,包括 20 次插入5 次删除
  1. 10 5
      libc/sysdeps/linux/mips/pipe.S
  2. 10 0
      libc/sysdeps/linux/mips/syscall.S

+ 10 - 5
libc/sysdeps/linux/mips/pipe.S

@@ -17,7 +17,16 @@
 pipe:
 pipe:
 	li	v0,__NR_pipe
 	li	v0,__NR_pipe
 	syscall
 	syscall
-	beqz	a3, 1f
+	bnez	a3, 1f
+	sw	v0, 0(a0)
+	sw	v1, 4(a0)
+	li	v0, 0
+	j	ra
+1:
+	/* uClibc change -- start */
+	move		a0,v0		/* Pass return val to C function. */
+	/* uClibc change -- stop */
+
 #ifdef __PIC__
 #ifdef __PIC__
 	PTR_LA	t9, __syscall_error
 	PTR_LA	t9, __syscall_error
 	jr	t9
 	jr	t9
@@ -25,10 +34,6 @@ pipe:
 	j	__syscall_error
 	j	__syscall_error
 #endif
 #endif
 1:
 1:
-	sw	v0, 0(a0)
-	sw	v1, 4(a0)
-	li	v0, 0
-	j	ra
 	.end	pipe
 	.end	pipe
 	.size	pipe,.-pipe
 	.size	pipe,.-pipe
 libc_hidden_def(pipe)
 libc_hidden_def(pipe)

+ 10 - 0
libc/sysdeps/linux/mips/syscall.S

@@ -60,6 +60,16 @@ syscall:
 #else
 #else
 	addiu	sp,sp,32
 	addiu	sp,sp,32
 #endif
 #endif
+	bnez	a3, 1f
      	j ra			/* Return to caller.  */
      	j ra			/* Return to caller.  */
+1:
+	move		a0,v0		/* Pass return val to C function. */
+
+#ifdef __PIC__
+	PTR_LA	t9, __syscall_error
+	jr	t9
+#else
+	j	__syscall_error
+#endif
 .end    syscall
 .end    syscall
 .size   syscall,.-syscall
 .size   syscall,.-syscall