Socket option constants are architecture specific.

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

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index 1f2fa604c04aa6744995f2afc6e4c03e523dcf79..ccaa194edb752e3e5302c134be3836e791da639f 100644 (file)
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -302,6 +302,8 @@ struct vki_f_owner_ex {
 
 #define VKI_SO_TYPE    3
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-x86_64/sockios.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h
index afb9bd793e8fcf41239b9ce25cddda5164461043..20be651efd1f2fb629ebcee008ecf2474fddb93f 100644 (file)
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -305,6 +305,8 @@ struct vki_f_owner_ex {
 
 #define VKI_SO_TYPE    3
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/sockios.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index b21c6e8d1eb73c5c8e98f711819c6c1c4f5332e2..bd00e4c70a47fd9a1b5cd828124cd5ac73fd8a96 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -680,11 +680,8 @@ __KINLINE struct vki_cmsghdr * vki_cmsg_nxthdr (struct vki_msghdr *__msg, struct
 
 #define VKI_MSG_NOSIGNAL       0x4000  /* Do not generate SIGPIPE */
 
-#define VKI_SOL_SOCKET 1
 #define VKI_SOL_SCTP   132
 
-#define VKI_SO_ATTACH_FILTER   26
-
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/linux/in.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h
index 9741d5c0a29e37e4990087a381b0dff322a1382b..b99aef4f29e03f25558e07a970dbc3c6e62ee1bd 100644 (file)
--- a/include/vki/vki-mips32-linux.h
+++ b/include/vki/vki-mips32-linux.h
@@ -371,8 +371,11 @@ struct vki_f_owner_ex {
 //----------------------------------------------------------------------
 
 #define VKI_SOL_SOCKET 0xffff
+
 #define VKI_SO_TYPE    0x1008
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.35.5/include/asm-i386/sockios.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h
index fcf8b4357eb1ac2b5c10cf5f122aa5b8ced7ef67..41185846ac762bcd326dad3f53c96656264c96da 100644 (file)
--- a/include/vki/vki-mips64-linux.h
+++ b/include/vki/vki-mips64-linux.h
@@ -376,8 +376,11 @@ struct vki_f_owner_ex {
 //----------------------------------------------------------------------
 
 #define VKI_SOL_SOCKET   0xffff
+
 #define VKI_SO_TYPE      0x1008
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.35.9/include/asm-i386/sockios.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 255f95e2a41a93579480fd0bc1e0df448f29c532..70e8dc7b9fd7e55baf075a2c7f3fff467fe84e9c 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -369,8 +369,15 @@ struct vki_f_owner_ex {
 //----------------------------------------------------------------------
 
 #define VKI_SOL_SOCKET 1
+
 #define VKI_SO_TYPE    3
 
+#define VKI_SO_ATTACH_FILTER   26
+
+//----------------------------------------------------------------------
+// From linux-2.6.8.1/include/asm-ppc/sockios.h
+//----------------------------------------------------------------------
+
 #define VKI_SIOCSPGRP          0x8902
 #define VKI_SIOCGPGRP          0x8904
 #define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index 06c8773233cbca17b16ebed4ade114a7c33d662f..c0b9ff166b264982156ef8ac9329808981181a91 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -423,6 +423,8 @@ struct vki_f_owner_ex {
 
 #define VKI_SO_TYPE         3
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/sockios.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h
index 8aa2ae451e518295206346873e7471507712e700..fae5f93572898d67c90f7f9d53b8ac114b2280a4 100644 (file)
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -369,6 +369,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SO_TYPE         3
 
+#define VKI_SO_ATTACH_FILTER        26
 
 //----------------------------------------------------------------------
 // From linux-2.6.16.60/include/asm-s390/sockios.h

diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index adfcb08cccee988603457c3c3e06dc8f4d6adb61..1efaeacb5a69664d7bb83c642ffdf6e2b6653469 100644 (file)
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -343,6 +343,8 @@ struct vki_f_owner_ex {
 
 #define VKI_SO_TYPE    3
 
+#define VKI_SO_ATTACH_FILTER   26
+
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/sockios.h
 //----------------------------------------------------------------------