The FIOCLEX and FIONCLEX ioctls are architecture specific.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13464

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index ccaa194edb752e3e5302c134be3836e791da639f..4d97ec4cb42d3c1f52ec36c0f869a60d455b3bce 100644 (file)
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -464,6 +464,8 @@ struct vki_termios {
 #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 */
 

diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h
index 20be651efd1f2fb629ebcee008ecf2474fddb93f..20044ae170a56bcfc7bd4256651fe1191027287d 100644 (file)
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -506,6 +506,8 @@ struct vki_termios {
 #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 */
 

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index bd00e4c70a47fd9a1b5cd828124cd5ac73fd8a96..b68862a889d87740808d87ed0cad5b1693fb61d8 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -2857,9 +2857,6 @@ struct vki_getcpu_cache {
 // 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

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 70e8dc7b9fd7e55baf075a2c7f3fff467fe84e9c..420d19c81eb0d9ca8e483ce7a30a0ffc0f8bd14d 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -557,8 +557,8 @@ struct vki_termios {
 // 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)

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index c0b9ff166b264982156ef8ac9329808981181a91..146e779f51fcd8293815bbc683b24b10a05911c8 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -604,6 +604,9 @@ struct vki_termios {
 // 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)

diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h
index fae5f93572898d67c90f7f9d53b8ac114b2280a4..caed21bceae9da0c086ad37c8e0a4cb7cf073550 100644 (file)
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -603,7 +603,9 @@ struct vki_termios {
 #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 */
 

diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index 1efaeacb5a69664d7bb83c642ffdf6e2b6653469..3839ee7c0c143cf140f9e9fc29f642d45388ffef 100644 (file)
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -544,6 +544,8 @@ struct vki_termios {
 #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 */