All targets define linkat; remove the ifdef.
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
linux-user/syscall.c | 66 +++++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index a146b696fd..936c7a7484 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8052,6 +8052,36 @@ IMPL(fork)
}
#endif
+#ifdef TARGET_NR_link
+IMPL(link)
+{
+ char *p1 = lock_user_string(arg1);
+ char *p2 = lock_user_string(arg2);
+ abi_long ret = -TARGET_EFAULT;
+
+ if (p1 && p2) {
+ ret = get_errno(link(p1, p2));
+ }
+ unlock_user(p1, arg1, 0);
+ unlock_user(p2, arg2, 0);
+ return ret;
+}
+#endif
+
+IMPL(linkat)
+{
+ char *p1 = lock_user_string(arg2);
+ char *p2 = lock_user_string(arg4);
+ abi_long ret = -TARGET_EFAULT;
+
+ if (p1 && p2) {
+ ret = get_errno(linkat(arg1, p1, arg3, p2, arg5));
+ }
+ unlock_user(p1, arg2, 0);
+ unlock_user(p2, arg4, 0);
+ return ret;
+}
+
#ifdef CONFIG_OPEN_BY_HANDLE
IMPL(name_to_handle_at)
{
@@ -8270,38 +8300,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_link
- case TARGET_NR_link:
- {
- void * p2;
- p = lock_user_string(arg1);
- p2 = lock_user_string(arg2);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(link(p, p2));
- unlock_user(p2, arg2, 0);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
-#if defined(TARGET_NR_linkat)
- case TARGET_NR_linkat:
- {
- void * p2 = NULL;
- if (!arg2 || !arg4)
- return -TARGET_EFAULT;
- p = lock_user_string(arg2);
- p2 = lock_user_string(arg4);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(linkat(arg1, p, arg3, p2, arg5));
- unlock_user(p, arg2, 0);
- unlock_user(p2, arg4, 0);
- }
- return ret;
-#endif
#ifdef TARGET_NR_unlink
case TARGET_NR_unlink:
if (!(p = lock_user_string(arg1)))
@@ -12506,6 +12504,10 @@ static impl_fn *syscall_table(unsigned num)
#ifdef TARGET_NR_fork
SYSCALL(fork);
#endif
+#ifdef TARGET_NR_link
+ SYSCALL(link);
+#endif
+ SYSCALL(linkat);
#ifdef CONFIG_OPEN_BY_HANDLE
SYSCALL(name_to_handle_at);
#endif
--
2.17.1
