From: Dejan Jevtic Date: Tue, 4 Mar 2014 14:12:47 +0000 (+0000) Subject: mips32/mips64: Fix the problem with VKI_ENOSYS and VKI_EOVERFLOW for mips32/64. X-Git-Tag: svn/VALGRIND_3_10_0~584 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efdafccacc9519da34065ca629b41764d79da689;p=thirdparty%2Fvalgrind.git mips32/mips64: Fix the problem with VKI_ENOSYS and VKI_EOVERFLOW for mips32/64. VKI_ENOSYS and VKI_EOVERFLOW don't have the same generic values for mips32/64. We need to define these values for every Linux arch. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13852 --- diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h index b7212c3aa9..393014896e 100644 --- a/include/vki/vki-amd64-linux.h +++ b/include/vki/vki-amd64-linux.h @@ -677,6 +677,13 @@ struct vki_shminfo64 { #define VKI_PTRACE_GETFPREGS 14 #define VKI_PTRACE_SETFPREGS 15 +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //---------------------------------------------------------------------- // And that's it! //---------------------------------------------------------------------- diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h index a81ce99aea..3ad6725c4e 100644 --- a/include/vki/vki-arm-linux.h +++ b/include/vki/vki-arm-linux.h @@ -887,6 +887,13 @@ struct vki_vm86plus_struct { #define VKI_HWCAP_NEON 4096 +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //---------------------------------------------------------------------- // And that's it! //---------------------------------------------------------------------- diff --git a/include/vki/vki-arm64-linux.h b/include/vki/vki-arm64-linux.h index 9eb0c20af4..9a5afbfdf6 100644 --- a/include/vki/vki-arm64-linux.h +++ b/include/vki/vki-arm64-linux.h @@ -670,6 +670,13 @@ struct vki_shminfo64 { //#define VKI_PTRACE_GETFPREGS 14 //#define VKI_PTRACE_SETFPREGS 15 +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //---------------------------------------------------------------------- // And that's it! //---------------------------------------------------------------------- diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h index a3c4b3c3c1..e386292c8d 100644 --- a/include/vki/vki-linux.h +++ b/include/vki/vki-linux.h @@ -1244,9 +1244,6 @@ struct vki_seminfo { #define VKI_EWOULDBLOCK VKI_EAGAIN -#define VKI_ENOSYS 38 /* Function not implemented */ -#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ - //---------------------------------------------------------------------- // From linux-2.6.8.1/include/linux/wait.h //---------------------------------------------------------------------- diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h index ee537197f0..96b5f15d93 100644 --- a/include/vki/vki-mips32-linux.h +++ b/include/vki/vki-mips32-linux.h @@ -976,6 +976,13 @@ enum vki_sock_type { }; #define ARCH_HAS_SOCKET_TYPES 1 +//---------------------------------------------------------------------- +// From linux-3.13.0/include/asm/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 89 /* Function not implemented */ +#define VKI_EOVERFLOW 79 /* Value too large for defined data type */ + #endif // __VKI_MIPS32_LINUX_H /*--------------------------------------------------------------------*/ diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h index 41185846ac..c072a30c1c 100644 --- a/include/vki/vki-mips64-linux.h +++ b/include/vki/vki-mips64-linux.h @@ -999,6 +999,13 @@ enum vki_sock_type { }; #define ARCH_HAS_SOCKET_TYPES 1 +//---------------------------------------------------------------------- +// From linux-3.13.0/include/asm/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 89 /* Function not implemented */ +#define VKI_EOVERFLOW 79 /* Value too large for defined data type */ + #endif // __VKI_MIPS64_LINUX_H /*--------------------------------------------------------------------*/ diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h index 999c481437..056fad2cde 100644 --- a/include/vki/vki-ppc32-linux.h +++ b/include/vki/vki-ppc32-linux.h @@ -921,6 +921,13 @@ struct vki_shminfo64 { unsigned long __unused4; }; +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //.. //---------------------------------------------------------------------- //.. // DRM ioctls //.. //---------------------------------------------------------------------- diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h index 1206924489..dca1c24812 100644 --- a/include/vki/vki-ppc64-linux.h +++ b/include/vki/vki-ppc64-linux.h @@ -779,6 +779,13 @@ struct vki_shminfo64 { unsigned long __unused4; }; +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //---------------------------------------------------------------------- // end //---------------------------------------------------------------------- diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h index 857ec2f27f..dcb82a1417 100644 --- a/include/vki/vki-s390x-linux.h +++ b/include/vki/vki-s390x-linux.h @@ -957,6 +957,13 @@ struct vki_shminfo64 { an error condition. I.e. the system call failed. */ #define VKI_MAX_ERRNO -125 +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + #endif // __VKI_S390X_LINUX_H /*--------------------------------------------------------------------*/ diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h index 155470a6e9..b3680932fa 100644 --- a/include/vki/vki-x86-linux.h +++ b/include/vki/vki-x86-linux.h @@ -893,6 +893,13 @@ struct vki_vm86plus_struct { struct vki_vm86plus_info_struct vm86plus; }; +//---------------------------------------------------------------------- +// From linux-2.6.8.1/include/asm-generic/errno.h +//---------------------------------------------------------------------- + +#define VKI_ENOSYS 38 /* Function not implemented */ +#define VKI_EOVERFLOW 75 /* Value too large for defined data type */ + //---------------------------------------------------------------------- // And that's it! //----------------------------------------------------------------------