Merge from branches/THUMB: add support for sys_pselect6, sys_pipe2,

sys_inotify_init1 on arm-linux.

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

diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
index d550469c04f1f0ae6072b883d1919a5a9385dbdc..875f9680be6519b7593151566e994fb2c6218e2b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
@@ -1657,10 +1657,13 @@ static SyscallTableEntry syscall_main_table[] = {
    // correspond to what's in include/vki/vki-scnums-arm-linux.h.
    // From here onwards, please ensure the numbers are correct.
 
+   LINX_(__NR_pselect6,                 sys_pselect6),         // 335
+
    LINXY(__NR_signalfd4,         sys_signalfd4),        // 355
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 356
 
-   LINXY(__NR_pipe2,             sys_pipe2)             // 359
+   LINXY(__NR_pipe2,             sys_pipe2),            // 359
+   LINXY(__NR_inotify_init1,     sys_inotify_init1)     // 360
 };
 
 

diff --git a/include/vki/vki-scnums-arm-linux.h b/include/vki/vki-scnums-arm-linux.h
index 559c87ecfa9c6e2a7f6563224232b8c6d565728c..24f28054bc85faa35820fe871586c9314934c11c 100644 (file)
--- a/include/vki/vki-scnums-arm-linux.h
+++ b/include/vki/vki-scnums-arm-linux.h
@@ -370,7 +370,7 @@
 #define __NR_readlinkat                        332
 #define __NR_fchmodat                  333
 #define __NR_faccessat                 334
-                                       /* 335 for pselect6 */
+#define __NR_pselect6                  335 /* JRS 20100812: is this correct? */
                                        /* 336 for ppoll */
 #define __NR_unshare                   337
 #define __NR_set_robust_list           338