|
From: <sv...@va...> - 2013-07-18 11:22:19
|
tom 2013-07-18 12:22:10 +0100 (Thu, 18 Jul 2013)
New Revision: 13464
Log:
The FIOCLEX and FIONCLEX ioctls are architecture specific.
Modified files:
trunk/include/vki/vki-amd64-linux.h
trunk/include/vki/vki-arm-linux.h
trunk/include/vki/vki-linux.h
trunk/include/vki/vki-ppc32-linux.h
trunk/include/vki/vki-ppc64-linux.h
trunk/include/vki/vki-s390x-linux.h
trunk/include/vki/vki-x86-linux.h
Modified: trunk/include/vki/vki-arm-linux.h (+2 -0)
===================================================================
--- trunk/include/vki/vki-arm-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-arm-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -506,6 +506,8 @@
#define VKI_TIOCGPTN _VKI_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define VKI_TIOCSPTLCK _VKI_IOW('T',0x31, int) /* Lock/unlock Pty */
+#define VKI_FIONCLEX 0x5450
+#define VKI_FIOCLEX 0x5451
#define VKI_FIOASYNC 0x5452
#define VKI_TIOCSERGETLSR 0x5459 /* Get line status register */
Modified: trunk/include/vki/vki-linux.h (+0 -3)
===================================================================
--- trunk/include/vki/vki-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -2857,9 +2857,6 @@
// From linux-2.6.39-rc2/include/asm_generic/ioctls.h
//----------------------------------------------------------------------
-#define VKI_FIONCLEX 0x5450
-#define VKI_FIOCLEX 0x5451
-
#ifndef VKI_FIOQSIZE
#define VKI_FIOQSIZE 0x5460 /* Value differs on some platforms */
#endif
Modified: trunk/include/vki/vki-s390x-linux.h (+3 -1)
===================================================================
--- trunk/include/vki/vki-s390x-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-s390x-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -603,7 +603,9 @@
#define VKI_TIOCGPTN _VKI_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define VKI_TIOCSPTLCK _VKI_IOW('T',0x31, int) /* Lock/unlock Pty */
-#define VKI_FIOASYNC 0x5452
+#define VKI_FIONCLEX 0x5450
+#define VKI_FIOCLEX 0x5451
+#define VKI_FIOASYNC 0x5452
#define VKI_TIOCSERGETLSR 0x5459 /* Get line status register */
Modified: trunk/include/vki/vki-ppc64-linux.h (+3 -0)
===================================================================
--- trunk/include/vki/vki-ppc64-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-ppc64-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -604,6 +604,9 @@
// From linux-2.6.13/include/asm-ppc64/ioctls.h
//----------------------------------------------------------------------
+#define VKI_FIOCLEX _VKI_IO('f', 1)
+#define VKI_FIONCLEX _VKI_IO('f', 2)
+
#define VKI_TCGETS _VKI_IOR('t', 19, struct vki_termios)
#define VKI_TCSETS _VKI_IOW('t', 20, struct vki_termios)
#define VKI_TCSETSW _VKI_IOW('t', 21, struct vki_termios)
Modified: trunk/include/vki/vki-amd64-linux.h (+2 -0)
===================================================================
--- trunk/include/vki/vki-amd64-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-amd64-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -464,6 +464,8 @@
#define VKI_TIOCGPTN _VKI_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define VKI_TIOCSPTLCK _VKI_IOW('T',0x31, int) /* Lock/unlock Pty */
+#define VKI_FIONCLEX 0x5450
+#define VKI_FIOCLEX 0x5451
#define VKI_FIOASYNC 0x5452
#define VKI_TIOCSERGETLSR 0x5459 /* Get line status register */
Modified: trunk/include/vki/vki-ppc32-linux.h (+2 -2)
===================================================================
--- trunk/include/vki/vki-ppc32-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-ppc32-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -557,8 +557,8 @@
// From linux-2.6.9/include/asm-ppc/ioctls.h
//----------------------------------------------------------------------
-//#define VKI_FIOCLEX _VKI_IO('f', 1)
-//#define VKI_FIONCLEX _VKI_IO('f', 2)
+#define VKI_FIOCLEX _VKI_IO('f', 1)
+#define VKI_FIONCLEX _VKI_IO('f', 2)
#define VKI_FIOASYNC _VKI_IOW('f', 125, int)
#define VKI_FIONBIO _VKI_IOW('f', 126, int)
#define VKI_FIONREAD _VKI_IOR('f', 127, int)
Modified: trunk/include/vki/vki-x86-linux.h (+2 -0)
===================================================================
--- trunk/include/vki/vki-x86-linux.h 2013-07-18 12:15:41 +01:00 (rev 13463)
+++ trunk/include/vki/vki-x86-linux.h 2013-07-18 12:22:10 +01:00 (rev 13464)
@@ -544,6 +544,8 @@
#define VKI_TIOCGPTN _VKI_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define VKI_TIOCSPTLCK _VKI_IOW('T',0x31, int) /* Lock/unlock Pty */
+#define VKI_FIONCLEX 0x5450
+#define VKI_FIOCLEX 0x5451
#define VKI_FIOASYNC 0x5452
#define VKI_TIOCSERGETLSR 0x5459 /* Get line status register */
|