[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/13] linux-user: protect fcntl64 with an #ifdef
From: |
Alex Bennée |
Subject: |
[PULL 03/13] linux-user: protect fcntl64 with an #ifdef |
Date: |
Tue, 7 Apr 2020 16:51:08 +0100 |
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 <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5af55fca781..b679bc6b136 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -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;
@@ -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;
}
--
2.20.1
- [PULL for 5.0-rc2 00/13] various fixes, Alex Bennée, 2020/04/07
- [PULL 02/13] elf-ops: bail out if we have no function symbols, Alex Bennée, 2020/04/07
- [PULL 03/13] linux-user: protect fcntl64 with an #ifdef,
Alex Bennée <=
- [PULL 04/13] tests/tcg: remove extraneous pasting macros, Alex Bennée, 2020/04/07
- [PULL 01/13] .github: Enable repo-lockdown bot to refuse GitHub pull requests, Alex Bennée, 2020/04/07
- [PULL 05/13] linux-user: more debug for init_guest_space, Alex Bennée, 2020/04/07
- [PULL 06/13] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/04/07
- [PULL 07/13] gdbstub: fix compiler complaining, Alex Bennée, 2020/04/07
- [PULL 10/13] linux-user: clean-up padding on /proc/self/maps, Alex Bennée, 2020/04/07
- [PULL 08/13] softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal, Alex Bennée, 2020/04/07