77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
|
From 1e8223836a2e09899cd946db4e4ee99b64ceb7a4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ulrich Hecht <uli@suse.de>
|
||
|
|
Date: Thu, 30 Jul 2009 16:02:52 +0200
|
||
|
|
Subject: [PATCH 33/33] dup3 check, fallocate check fixed
|
||
|
|
|
||
|
|
Signed-off-by: Ulrich Hecht <uli@suse.de>
|
||
|
|
---
|
||
|
|
configure | 20 +++++++++++++++++++-
|
||
|
|
linux-user/syscall.c | 4 +++-
|
||
|
|
2 files changed, 22 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index 4be25f6..8d3967d 100755
|
||
|
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -1370,6 +1370,21 @@ if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
|
||
|
|
fallocate=yes
|
||
|
|
fi
|
||
|
|
|
||
|
|
+# check for dup3
|
||
|
|
+dup3=no
|
||
|
|
+cat > $TMPC << EOF
|
||
|
|
+#include <unistd.h>
|
||
|
|
+
|
||
|
|
+int main(void)
|
||
|
|
+{
|
||
|
|
+ dup3(0, 0, 0);
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+EOF
|
||
|
|
+if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
|
||
|
|
+ dup3=yes
|
||
|
|
+fi
|
||
|
|
+
|
||
|
|
# Check if tools are available to build documentation.
|
||
|
|
if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x "`which pod2man 2>/dev/null`" \) ; then
|
||
|
|
build_docs="no"
|
||
|
|
@@ -1723,7 +1738,10 @@ if test "$splice" = "yes" ; then
|
||
|
|
echo "#define CONFIG_SPLICE 1" >> $config_host_h
|
||
|
|
fi
|
||
|
|
if test "$fallocate" = "yes" ; then
|
||
|
|
- echo "#define CONFIG_FALLOCATE 1" >> $config_host_h
|
||
|
|
+ echo "CONFIG_FALLOCATE=y" >> $config_host_mak
|
||
|
|
+fi
|
||
|
|
+if test "$dup3" = "yes" ; then
|
||
|
|
+ echo "CONFIG_DUP3=y" >> $config_host_mak
|
||
|
|
fi
|
||
|
|
if test "$inotify" = "yes" ; then
|
||
|
|
echo "#define CONFIG_INOTIFY 1" >> $config_host_h
|
||
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||
|
|
index ef76537..6c109de 100644
|
||
|
|
--- a/linux-user/syscall.c
|
||
|
|
+++ b/linux-user/syscall.c
|
||
|
|
@@ -3707,8 +3707,10 @@ static int target_to_host_fcntl_cmd(int cmd)
|
||
|
|
return F_SETLEASE;
|
||
|
|
case TARGET_F_GETLEASE:
|
||
|
|
return F_GETLEASE;
|
||
|
|
+#ifdef F_DUPFD_CLOEXEC
|
||
|
|
case TARGET_F_DUPFD_CLOEXEC:
|
||
|
|
return F_DUPFD_CLOEXEC;
|
||
|
|
+#endif
|
||
|
|
case TARGET_F_NOTIFY:
|
||
|
|
return F_NOTIFY;
|
||
|
|
default:
|
||
|
|
@@ -4758,7 +4760,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
||
|
|
case TARGET_NR_dup2:
|
||
|
|
ret = get_errno(dup2(arg1, arg2));
|
||
|
|
break;
|
||
|
|
-#ifdef TARGET_NR_dup3
|
||
|
|
+#if defined(TARGET_NR_dup3) && defined(CONFIG_DUP3)
|
||
|
|
case TARGET_NR_dup3:
|
||
|
|
ret = get_errno(dup3(arg1, arg2, arg3));
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
1.6.2.1
|
||
|
|
|