[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/8] linux-user: move ppc socket.h definitions to
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v2 5/8] linux-user: move ppc socket.h definitions to ppc/sockbits.h |
Date: |
Wed, 16 May 2018 22:55:40 +0200 |
No code change.
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/generic/sockbits.h | 9 +--------
linux-user/ppc/sockbits.h | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h
index 093faf0a48..5ad43eb0c8 100644
--- a/linux-user/generic/sockbits.h
+++ b/linux-user/generic/sockbits.h
@@ -30,14 +30,7 @@
#define TARGET_SO_LINGER 13
#define TARGET_SO_BSDCOMPAT 14
/* To add :#define TARGET_SO_REUSEPORT 15 */
-#if defined(TARGET_PPC)
-#define TARGET_SO_RCVLOWAT 16
-#define TARGET_SO_SNDLOWAT 17
-#define TARGET_SO_RCVTIMEO 18
-#define TARGET_SO_SNDTIMEO 19
-#define TARGET_SO_PASSCRED 20
-#define TARGET_SO_PEERCRED 21
-#else
+#ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */
#define TARGET_SO_PASSCRED 16
#define TARGET_SO_PEERCRED 17
#define TARGET_SO_RCVLOWAT 18
diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h
index 0e4c8f012d..3593bc44ac 100644
--- a/linux-user/ppc/sockbits.h
+++ b/linux-user/ppc/sockbits.h
@@ -1 +1,20 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation, or (at your option) any
+ * later version. See the COPYING file in the top-level directory.
+ */
+
+#ifndef PPC_SOCKBITS_H
+#define PPC_SOCKBITS_H
+
+#define TARGET_SO_RCVLOWAT 16
+#define TARGET_SO_SNDLOWAT 17
+#define TARGET_SO_RCVTIMEO 18
+#define TARGET_SO_SNDTIMEO 19
+#define TARGET_SO_PASSCRED 20
+#define TARGET_SO_PEERCRED 21
+
#include "../generic/sockbits.h"
+
+#endif
--
2.14.3
[Qemu-devel] [PATCH v2 2/8] linux-user: move alpha socket.h definitions to alpha/sockbits.h, Laurent Vivier, 2018/05/16
[Qemu-devel] [PATCH v2 3/8] linux-user: move sparc/sparc64 socket.h definitions to sparc/sockbits.h, Laurent Vivier, 2018/05/16
[Qemu-devel] [PATCH v2 4/8] linux-user: move socket.h generic definitions to generic/sockbits.h, Laurent Vivier, 2018/05/16
[Qemu-devel] [PATCH v2 6/8] linux-user: update ARCH_HAS_SOCKET_TYPES use, Laurent Vivier, 2018/05/16