Skip to content

Commit

Permalink
linux-user: protect fcntl64 with an #ifdef
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stsquad committed Apr 7, 2020
1 parent 040425f commit bbf5f2a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions linux-user/syscall.c
Expand Up @@ -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. */
return 0;
#endif
#if TARGET_ABI_BITS == 32
#ifdef TARGET_NR_fcntl64
case TARGET_NR_fcntl64:
{
int cmd;
struct flock64 fl;
int cmd;
struct flock64 fl;
from_flock64_fn *copyfrom = copy_from_user_flock64;
to_flock64_fn *copyto = copy_to_user_flock64;

Expand All @@ -11346,7 +11346,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
}
#endif

cmd = target_to_host_fcntl_cmd(arg2);
cmd = target_to_host_fcntl_cmd(arg2);
if (cmd == -TARGET_EINVAL) {
return cmd;
}
Expand Down

0 comments on commit bbf5f2a

Please sign in to comment.