commit 597c0212a7b3f16af26dc29fbb5653999b8cd31f
author takasi-y@ops.dti.ne.jp <takasi-y@ops.dti.ne.jp> Thu Feb 18 00:35:03 2010 +0900
committer Aurelien Jarno <aurelien@aurel32.net> Sat Mar 06 19:35:18 2010 +0100
tree 2c9669e7a726af9f0fd62761115270cdf7b275b3
parent 41b1e61f51b05fd6ca060f901b822f83e0beb6b6

linux-user: Fix syscall pipe2() retval on sh4

On linux/sh4
 pipe() return values by r0:r1 as SH C calling convention.
 pipe2() return values on memory as traditional unix way.

Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 38eb35f..80d8633 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -969,10 +969,13 @@
 #if defined(TARGET_MIPS)
     ((CPUMIPSState*)cpu_env)->active_tc.gpr[3] = host_pipe[1];
     ret = host_pipe[0];
-#elif defined(TARGET_SH4)
-    ((CPUSH4State*)cpu_env)->gregs[1] = host_pipe[1];
-    ret = host_pipe[0];
 #else
+#if defined(TARGET_SH4)
+    if (!flags) {
+        ((CPUSH4State*)cpu_env)->gregs[1] = host_pipe[1];
+        ret = host_pipe[0];
+    } else
+#endif
     if (put_user_s32(host_pipe[0], pipedes)
         || put_user_s32(host_pipe[1], pipedes + sizeof(host_pipe[0])))
         return -TARGET_EFAULT;