[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] linux-user: move sparc/sparc64 fcntl definiti
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 07/15] linux-user: move sparc/sparc64 fcntl definitions to sparc/target_fcntl.h |
Date: |
Tue, 29 May 2018 21:41:59 +0200 |
No code change.
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/sparc/target_fcntl.h | 34 ++++++++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 39 ---------------------------------------
2 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/linux-user/sparc/target_fcntl.h b/linux-user/sparc/target_fcntl.h
index 35a753153b..c2532989e5 100644
--- a/linux-user/sparc/target_fcntl.h
+++ b/linux-user/sparc/target_fcntl.h
@@ -7,5 +7,39 @@
#ifndef SPARC_TARGET_FCNTL_H
#define SPARC_TARGET_FCNTL_H
+
+#define TARGET_O_APPEND 0x0008
+#define TARGET_FASYNC 0x0040 /* fcntl, for BSD compatibility */
+#define TARGET_O_CREAT 0x0200 /* not fcntl */
+#define TARGET_O_TRUNC 0x0400 /* not fcntl */
+#define TARGET_O_EXCL 0x0800 /* not fcntl */
+#define TARGET_O_DSYNC 0x2000
+#define TARGET_O_NONBLOCK 0x4000
+# ifdef TARGET_SPARC64
+# define TARGET_O_NDELAY 0x0004
+# else
+# define TARGET_O_NDELAY (0x0004 | TARGET_O_NONBLOCK)
+# endif
+#define TARGET_O_NOCTTY 0x8000 /* not fcntl */
+#define TARGET_O_LARGEFILE 0x40000
+#define TARGET_O_DIRECT 0x100000 /* direct disk access hint */
+#define TARGET_O_NOATIME 0x200000
+#define TARGET_O_CLOEXEC 0x400000
+#define TARGET___O_SYNC 0x800000
+#define TARGET_O_PATH 0x1000000
+#define TARGET___O_TMPFILE 0x2000000
+
+#define TARGET_F_RDLCK 1
+#define TARGET_F_WRLCK 2
+#define TARGET_F_UNLCK 3
+#define TARGET_F_GETOWN 5 /* for sockets. */
+#define TARGET_F_SETOWN 6 /* for sockets. */
+#define TARGET_F_GETLK 7
+#define TARGET_F_SETLK 8
+#define TARGET_F_SETLKW 9
+
+#define TARGET_ARCH_FLOCK_PAD abi_short __unused;
+#define TARGET_ARCH_FLOCK64_PAD abi_short __unused;
+
#include "../generic/fcntl.h"
#endif
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index a434edadf8..fbf1bf995a 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2407,17 +2407,6 @@ struct target_statfs64 {
};
#endif
-#if defined(TARGET_SPARC)
-#define TARGET_F_RDLCK 1
-#define TARGET_F_WRLCK 2
-#define TARGET_F_UNLCK 3
-#define TARGET_F_GETOWN 5 /* for sockets. */
-#define TARGET_F_SETOWN 6 /* for sockets. */
-#define TARGET_F_GETLK 7
-#define TARGET_F_SETLK 8
-#define TARGET_F_SETLKW 9
-#endif
-
#define TARGET_F_LINUX_SPECIFIC_BASE 1024
#define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0)
#define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1)
@@ -2426,34 +2415,6 @@ struct target_statfs64 {
#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8)
#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE+2)
-#if defined (TARGET_SPARC)
-#define TARGET_O_APPEND 0x0008
-#define TARGET_FASYNC 0x0040 /* fcntl, for BSD compatibility */
-#define TARGET_O_CREAT 0x0200 /* not fcntl */
-#define TARGET_O_TRUNC 0x0400 /* not fcntl */
-#define TARGET_O_EXCL 0x0800 /* not fcntl */
-#define TARGET_O_DSYNC 0x2000
-#define TARGET_O_NONBLOCK 0x4000
-# ifdef TARGET_SPARC64
-# define TARGET_O_NDELAY 0x0004
-# else
-# define TARGET_O_NDELAY (0x0004 | TARGET_O_NONBLOCK)
-# endif
-#define TARGET_O_NOCTTY 0x8000 /* not fcntl */
-#define TARGET_O_LARGEFILE 0x40000
-#define TARGET_O_DIRECT 0x100000 /* direct disk access hint */
-#define TARGET_O_NOATIME 0x200000
-#define TARGET_O_CLOEXEC 0x400000
-#define TARGET___O_SYNC 0x800000
-#define TARGET_O_PATH 0x1000000
-#define TARGET___O_TMPFILE 0x2000000
-#endif
-
-#if defined(TARGET_SPARC)
-#define TARGET_ARCH_FLOCK_PAD abi_short __unused;
-#define TARGET_ARCH_FLOCK64_PAD abi_short __unused;
-#endif
-
#include "target_fcntl.h"
/* soundcard defines */
--
2.14.3
- [Qemu-devel] [PATCH 04/15] linux-user: move arm/aarch64/m68k fcntl definitions to [arm|aarch64|m68k]/target_fcntl.h, (continued)
- [Qemu-devel] [PATCH 04/15] linux-user: move arm/aarch64/m68k fcntl definitions to [arm|aarch64|m68k]/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 05/15] linux-user: move mips/mips64 fcntl definitions to mips/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 01/15] linux-user: move generic fcntl definitions to generic/fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 09/15] linux-user: move generic signal definitions to generic/signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 02/15] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 03/15] linux-user: move hppa fcntl definitions to hppa/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 06/15] linux-user: move ppc fcntl definitions to ppc/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 07/15] linux-user: move sparc/sparc64 fcntl definitions to sparc/target_fcntl.h,
Laurent Vivier <=
- [Qemu-devel] [PATCH 12/15] linux-user: move openrisc signal definitions to openrisc/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 10/15] linux-user: move sparc signal definitions to sparc/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 13/15] linux-user: move alpha signal definitions to alpha/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 15/15] linux-user: remove useless #if, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 14/15] linux-user: move hppa signal definitions to hppa/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 08/15] linux-user: move get_sp_from_cpustate() to target_cpu.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 11/15] linux-user: move mips signal definitions to mips/target_signal.h, Laurent Vivier, 2018/05/29
- Re: [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h, no-reply, 2018/05/29
- Re: [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h, Richard Henderson, 2018/05/30