svn commit: trunk/uClibc/libc/sysdeps/linux/mips

[sjhill at uclibc.org]

Author: sjhill
Date: 2007-05-23 20:00:08 -0700 (Wed, 23 May 2007)
New Revision: 18677

Log:
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> .


Modified:
   trunk/uClibc/libc/sysdeps/linux/mips/pipe.S
   trunk/uClibc/libc/sysdeps/linux/mips/syscall.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/mips/pipe.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/pipe.S	2007-05-24 02:56:59 UTC (rev 18676)
+++ trunk/uClibc/libc/sysdeps/linux/mips/pipe.S	2007-05-24 03:00:08 UTC (rev 18677)
@@ -17,7 +17,16 @@
 pipe:
 	li	v0,__NR_pipe
 	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__
 	PTR_LA	t9, __syscall_error
 	jr	t9
@@ -25,10 +34,6 @@
 	j	__syscall_error
 #endif
 1:
-	sw	v0, 0(a0)
-	sw	v1, 4(a0)
-	li	v0, 0
-	j	ra
 	.end	pipe
 	.size	pipe,.-pipe
 libc_hidden_def(pipe)

Modified: trunk/uClibc/libc/sysdeps/linux/mips/syscall.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/syscall.S	2007-05-24 02:56:59 UTC (rev 18676)
+++ trunk/uClibc/libc/sysdeps/linux/mips/syscall.S	2007-05-24 03:00:08 UTC (rev 18677)
@@ -60,6 +60,16 @@
 #else
 	addiu	sp,sp,32
 #endif
+	bnez	a3, 1f
      	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
 .size   syscall,.-syscall