diff mbox series

[v3,5/8] linux-user: move ppc socket.h definitions to ppc/sockbits.h

Message ID 20180519092956.15134-6-laurent@vivier.eu
State New
Headers show
Series linux-user: move socket.h definitions to CPU directories | expand

Commit Message

Laurent Vivier May 19, 2018, 9:29 a.m. UTC 
Change conditional #ifdef part by #undef of the symbols
redefined for PPC relative to generic/socket.h

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/generic/sockbits.h |  9 ---------
 linux-user/ppc/sockbits.h     | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

Comments

Peter Maydell May 21, 2018, 9:05 a.m. UTC | #1 
On 19 May 2018 at 10:29, Laurent Vivier <laurent@vivier.eu> wrote:
> Change conditional #ifdef part by #undef of the symbols
> redefined for PPC relative to generic/socket.h
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox series

Patch

diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h
index 093faf0a48..99505f1f85 100644
--- a/linux-user/generic/sockbits.h
+++ b/linux-user/generic/sockbits.h
@@ -30,21 +30,12 @@ 
 #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
 #define TARGET_SO_PASSCRED     16
 #define TARGET_SO_PEERCRED     17
 #define TARGET_SO_RCVLOWAT     18
 #define TARGET_SO_SNDLOWAT     19
 #define TARGET_SO_RCVTIMEO     20
 #define TARGET_SO_SNDTIMEO     21
-#endif
 
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define TARGET_SO_SECURITY_AUTHENTICATION              22
diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h
index 0e4c8f012d..ee453347a3 100644
--- a/linux-user/ppc/sockbits.h
+++ b/linux-user/ppc/sockbits.h
@@ -1 +1,26 @@ 
+/*
+ * 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
+
 #include "../generic/sockbits.h"
+
+#undef  TARGET_SO_RCVLOWAT
+#define TARGET_SO_RCVLOWAT     16
+#undef  TARGET_SO_SNDLOWAT
+#define TARGET_SO_SNDLOWAT     17
+#undef  TARGET_SO_RCVTIMEO
+#define TARGET_SO_RCVTIMEO     18
+#undef  TARGET_SO_SNDTIMEO
+#define TARGET_SO_SNDTIMEO     19
+#undef  TARGET_SO_PASSCRED
+#define TARGET_SO_PASSCRED     20
+#undef  TARGET_SO_PEERCRED
+#define TARGET_SO_PEERCRED     21
+
+#endif