diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2013-01-10 22:30:50 +0100 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-16 08:15:16 -0800 |
| commit | 9468a5d4904223af2c47131f32e3a0555142e4e3 (patch) | |
| tree | df22091f32c803a75cd2f843a73f3657ac903e43 /linux-user/syscall.c | |
| parent | 2ba7f73006371312109991869b13bf8f4b4659c4 (diff) | |
| download | focaccia-qemu-9468a5d4904223af2c47131f32e3a0555142e4e3.tar.gz focaccia-qemu-9468a5d4904223af2c47131f32e3a0555142e4e3.zip | |
alpha-linux-user: Correct select
Alpha, like s390x, passes all select arguments in registers. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 94f79dd3a1..693e66fc4f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6227,8 +6227,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(settimeofday(&tv, NULL)); } break; -#if defined(TARGET_NR_select) && !defined(TARGET_S390X) && !defined(TARGET_S390) +#if defined(TARGET_NR_select) case TARGET_NR_select: +#if defined(TARGET_S390X) || defined(TARGET_ALPHA) + ret = do_select(arg1, arg2, arg3, arg4, arg5); +#else { struct target_sel_arg_struct *sel; abi_ulong inp, outp, exp, tvp; @@ -6244,6 +6247,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, unlock_user_struct(sel, arg1, 0); ret = do_select(nsel, inp, outp, exp, tvp); } +#endif break; #endif #ifdef TARGET_NR_pselect6 @@ -7167,12 +7171,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; #endif /* TARGET_NR_getdents64 */ -#if defined(TARGET_NR__newselect) || defined(TARGET_S390X) -#ifdef TARGET_S390X - case TARGET_NR_select: -#else +#if defined(TARGET_NR__newselect) case TARGET_NR__newselect: -#endif ret = do_select(arg1, arg2, arg3, arg4, arg5); break; #endif |