linux-user: protect fcntl64 with an #ifdef
Checking TARGET_ABI_BITS is sketchy - we should check for the presence of the define to be sure. Also clean up the white space while we are there. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200403191150.863-3-alex.bennee@linaro.org>
This commit is contained in:
parent
040425f849
commit
bbf5f2a1aa
|
@ -11331,11 +11331,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
||||||
This is a hint, so ignoring and returning success is ok. */
|
This is a hint, so ignoring and returning success is ok. */
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
#if TARGET_ABI_BITS == 32
|
#ifdef TARGET_NR_fcntl64
|
||||||
case TARGET_NR_fcntl64:
|
case TARGET_NR_fcntl64:
|
||||||
{
|
{
|
||||||
int cmd;
|
int cmd;
|
||||||
struct flock64 fl;
|
struct flock64 fl;
|
||||||
from_flock64_fn *copyfrom = copy_from_user_flock64;
|
from_flock64_fn *copyfrom = copy_from_user_flock64;
|
||||||
to_flock64_fn *copyto = copy_to_user_flock64;
|
to_flock64_fn *copyto = copy_to_user_flock64;
|
||||||
|
|
||||||
|
@ -11346,7 +11346,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cmd = target_to_host_fcntl_cmd(arg2);
|
cmd = target_to_host_fcntl_cmd(arg2);
|
||||||
if (cmd == -TARGET_EINVAL) {
|
if (cmd == -TARGET_EINVAL) {
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue