From 597c0212a7b3f16af26dc29fbb5653999b8cd31f Mon Sep 17 00:00:00 2001 From: "takasi-y@ops.dti.ne.jp" Date: Thu, 18 Feb 2010 00:35:03 +0900 Subject: [PATCH] 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 Signed-off-by: Aurelien Jarno --- linux-user/syscall.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 38eb35f542..80d8633473 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -969,10 +969,13 @@ static abi_long do_pipe(void *cpu_env, abi_ulong pipedes, int flags) #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;