Fixes for kernel stub builds

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3473 7fd9a85b-ad96-42d3-883c-3090e2eb8679

3 files changed, 6 insertions, 7 deletions

diff --git a/nuttx/syscall/stub_lookup.c b/nuttx/syscall/stub_lookup.c
index 5ed67fd0a1..8743e2fda0 100644
--- a/nuttx/syscall/stub_lookup.c
+++ b/nuttx/syscall/stub_lookup.c
@@ -190,7 +190,6 @@ extern uintptr_t STUB_pthread_setcancelstate(uintptr_t parm1, uintptr_t parm2);
 extern uintptr_t STUB_pthread_setschedparam(uintptr_t parm1, uintptr_t parm2, uintptr_t parm3);
 extern uintptr_t STUB_pthread_setschedprio(uintptr_t parm1, uintptr_t parm2);
 extern uintptr_t STUB_pthread_setspecific(uintptr_t parm1, uintptr_t parm2);
-extern uintptr_t STUB_pthread_testcancel(void);
 extern uintptr_t STUB_pthread_yield(void);
 
 extern uintptr_t STUB_pthread_cond_timedwait(uintptr_t parm1, uintptr_t parm2, uintptr_t parm3);
diff --git a/nuttx/syscall/stub_lookup.h b/nuttx/syscall/stub_lookup.h
index 112fdd16a4..31b4c755d8 100644
--- a/nuttx/syscall/stub_lookup.h
+++ b/nuttx/syscall/stub_lookup.h
@@ -125,10 +125,12 @@ STUB_LOOKUP(3, STUB_up_assert_code)             /* SYS_up_assert_code */
 #if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0 
   STUB_LOOKUP(1, STUB_close)                    /* SYS_close */
   STUB_LOOKUP(3, STUB_ioctl)                    /* SYS_ioctl */
-  STUB_LOOKUP(3, STUB_poll)                     /* SYS_poll */
   STUB_LOOKUP(3, STUB_read)                     /* SYS_read */
-  STUB_LOOKUP(5, STUB_select)                   /* SYS_select */
   STUB_LOOKUP(3, STUB_write)                    /* SYS_write */
+#  ifndef CONFIG_DISABLE_POLL
+  STUB_LOOKUP(3, STUB_poll)                     /* SYS_poll */
+  STUB_LOOKUP(5, STUB_select)                   /* SYS_select */
+#  endif
 #endif
 
 /* The following are defined if file descriptors are enabled */
@@ -197,7 +199,6 @@ STUB_LOOKUP(3, STUB_up_assert_code)             /* SYS_up_assert_code */
   STUB_LOOKUP(3, STUB_pthread_setschedparam)    /* SYS_pthread_setschedparam */
   STUB_LOOKUP(2, STUB_pthread_setschedprio)     /* SYS_pthread_setschedprio */
   STUB_LOOKUP(2, STUB_pthread_setspecific)      /* SYS_pthread_setspecific */
-  STUB_LOOKUP(0, STUB_pthread_testcancel)       /* SYS_pthread_testcancel */
   STUB_LOOKUP(0, STUB_pthread_yield)            /* SYS_pthread_yield */
 #  ifndef CONFIG_DISABLE_SIGNAL
     STUB_LOOKUP(3, STUB_pthread_cond_timedwait) /* SYS_pthread_cond_timedwait */
diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv
index 4ec12f23be..2510f87d82 100644
--- a/nuttx/syscall/syscall.csv
+++ b/nuttx/syscall/syscall.csv
@@ -39,7 +39,7 @@
 "open","fcntl.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","int","..."
 "opendir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","FAR DIR*","FAR const char*"
 "pipe","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int [2]|int*"
-"poll","poll.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","FAR struct pollfd*","nfds_t","int"
+"poll","poll.h","!defined(CONFIG_DISABLE_POLL) && (CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0)","int","FAR struct pollfd*","nfds_t","int"
 "pthread_barrier_destroy","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*"
 "pthread_barrier_init","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*","FAR const pthread_barrierattr_t*","unsigned int"
 "pthread_barrier_wait","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*"
@@ -70,7 +70,6 @@
 "pthread_setschedprio","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","pthread_t","int"
 "pthread_setspecific","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","pthread_key_t","FAR void*"
 "pthread_sigmask","pthread.h","!defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_DISABLE_PTHREAD)","int","int","FAR const sigset_t*","FAR sigset_t*"
-"pthread_testcancel","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","void"
 "pthread_yield","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","void"
 "putenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char*"
 "read","unistd.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","ssize_t","int","FAR void*","size_t"
@@ -91,7 +90,7 @@
 "sched_unlock","sched.h","","int"
 "sched_yield","sched.h","","int"
 "seekdir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","void","FAR DIR*","off_t"
-"select","sys/select.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int","FAR fd_set*","FAR fd_set*","FAR fd_set*","FAR struct timeval*"
+"select","sys/select.h","!defined(CONFIG_DISABLE_POLL) && (CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0)","int","int","FAR fd_set*","FAR fd_set*","FAR fd_set*","FAR struct timeval*"
 "sem_close","semaphore.h","","int","FAR sem_t*"
 "sem_destroy","semaphore.h","","int","FAR sem_t*"
 "sem_open","semaphore.h","","FAR sem_t*","FAR const char*","int","..."