python · kuhlenough · Sep 15, 2017 · Sep 15, 2017 · Sep 17, 2017 · Sep 17, 2017
diff --git a/Include/osdefs.h b/Include/osdefs.h
@@ -14,6 +14,10 @@ extern "C" {
 #define DELIM L';'
 #endif
 
+#ifdef __VXWORKS__
+#define DELIM L';'
+#endif
+
 /* Filename separator */
 #ifndef SEP
 #define SEP L'/'

diff --git a/Include/symtable.h b/Include/symtable.h
@@ -103,6 +103,10 @@ PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
 #define SCOPE_OFFSET 11
 #define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
 
+#ifdef __VXWORKS__
+  #undef LOCAL
+#endif
+
 #define LOCAL 1
 #define GLOBAL_EXPLICIT 2
 #define GLOBAL_IMPLICIT 3

diff --git a/Misc/NEWS.d/next/Build/2017-10-30.bpo-30914.brk.rst b/Misc/NEWS.d/next/Build/2017-10-30.bpo-30914.brk.rst
@@ -0,0 +1 @@
+Allow cross-build of VxWorks if --host=*-wrs-vxworks is passed to configure
diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
@@ -32,8 +32,12 @@
 #  define BOOL int
 #  define UINT32 uint32_t
 #  define INT32 int32_t
-#  define TRUE 1
-#  define FALSE 0
+#  ifndef TRUE
+#    define TRUE 1
+#  endif
+#  ifndef FALSE
+#    define FALSE 0
+#  endif
 #  define INVALID_HANDLE_VALUE (-1)
 #endif
 

diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
@@ -1721,7 +1721,7 @@ os_execve(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames
 
 #endif /* defined(HAVE_EXECV) */
 
-#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV))
+#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) || defined(__VXWORKS__)
 
 PyDoc_STRVAR(os_spawnv__doc__,
 "spawnv($module, mode, path, argv, /)\n"
@@ -1765,7 +1765,7 @@ os_spawnv(PyObject *module, PyObject **args, Py_ssize_t nargs)
 
 #endif /* (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) */
 
-#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV))
+#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) || defined(__VXWORKS__)
 
 PyDoc_STRVAR(os_spawnve__doc__,
 "spawnve($module, mode, path, argv, env, /)\n"

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
@@ -13,6 +13,9 @@
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
+#ifdef __VXWORKS__
+#  include <ioLib.h>
+#endif
 
 /* Allocate at maximum 100 MiB of the stack to raise the stack overflow */
 #define STACK_OVERFLOW_MAX_SIZE (100 * 1024 * 1024)

diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
@@ -15,6 +15,10 @@
 #include <stropts.h>
 #endif
 
+#ifdef __VXWORKS__
+#include <ioLib.h>   /* ioctl() */
+#endif
+
 /*[clinic input]
 module fcntl
 [clinic start generated code]*/

diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
@@ -4,6 +4,11 @@
 #include <stdio.h>
 #endif
 
+#ifdef __VXWORKS__
+#undef DATE
+#undef TIME
+#endif
+
 #ifndef DATE
 #ifdef __DATE__
 #define DATE __DATE__

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -174,6 +174,7 @@ corresponding Unix manual entries for more information on calls.");
 #define HAVE_FSYNC      1
 #define fsync _commit
 #else
+#ifndef __VXWORKS__
 /* Unix functions that the configure script doesn't check for */
 #define HAVE_EXECV      1
 #define HAVE_FORK       1
@@ -184,6 +185,7 @@ corresponding Unix manual entries for more information on calls.");
 #define HAVE_GETEUID    1
 #define HAVE_GETGID     1
 #define HAVE_GETPPID    1
+#endif
 #define HAVE_GETUID     1
 #define HAVE_KILL       1
 #define HAVE_OPENDIR    1
@@ -246,6 +248,19 @@ extern int lstat(const char *, struct stat *);
 
 #endif /* !_MSC_VER */
 
+#if defined(__VXWORKS__)
+#include <vxCpuLib.h>
+#include <rtpLib.h>
+#define HAVE_RTPSPAWN 1
+#ifndef _P_WAIT
+#define _P_WAIT 3
+#define _P_NOWAIT 2
+#define _P_NOWAITO 1
+#define _OLD_P_OVERLAY 0
+#define _P_OVERLAY 0
+#endif
+#endif 
+
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif /* HAVE_UTIME_H */
@@ -4770,7 +4785,7 @@ os__exit_impl(PyObject *module, int status)
 #define EXECV_CHAR char
 #endif
 
-#if defined(HAVE_EXECV) || defined(HAVE_SPAWNV)
+#if defined(HAVE_EXECV) || defined(HAVE_SPAWNV) || defined (HAVE_RTPSPAWN)
 static void
 free_string_array(EXECV_CHAR **array, Py_ssize_t count)
 {
@@ -4808,7 +4823,7 @@ fsconvert_strdup(PyObject *o, EXECV_CHAR **out)
 }
 #endif
 
-#if defined(HAVE_EXECV) || defined (HAVE_FEXECVE)
+#if defined(HAVE_EXECV) || defined (HAVE_FEXECVE) || defined (HAVE_RTPSPAWN)
 static EXECV_CHAR**
 parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
 {
@@ -5079,7 +5094,7 @@ os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env)
 #endif /* HAVE_EXECV */
 
 
-#if defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)
+#if defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV) || defined(HAVE_RTPSPAWN)
 /*[clinic input]
 os.spawnv
 
@@ -5156,6 +5171,11 @@ os_spawnv_impl(PyObject *module, int mode, path_t *path, PyObject *argv)
     _Py_BEGIN_SUPPRESS_IPH
 #ifdef HAVE_WSPAWNV
     spawnval = _wspawnv(mode, path->wide, argvlist);
+#elif defined (HAVE_RTPSPAWN)
+    spawnval = rtpSpawn(path->narrow, (const char **)argvlist, 
+                   NULL, 100, 0, 0, 0);
+    if ( (spawnval != RTP_ID_ERROR) && (mode == _P_WAIT) )
+        waitpid(spawnval, &spawnval, 0);
 #else
     spawnval = _spawnv(mode, path->narrow, argvlist);
 #endif
@@ -5262,6 +5282,11 @@ os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv,
     _Py_BEGIN_SUPPRESS_IPH
 #ifdef HAVE_WSPAWNV
     spawnval = _wspawnve(mode, path->wide, argvlist, envlist);
+#elif defined (HAVE_RTPSPAWN)
+    spawnval = rtpSpawn(path->narrow, (const char **)argvlist, 
+                   (const char **)envlist, 100, 0, 0, 0);
+    if ( (spawnval != RTP_ID_ERROR) && (mode == _P_WAIT) )
+        waitpid(spawnval, &spawnval, 0);
 #else
     spawnval = _spawnve(mode, path->narrow, argvlist, envlist);
 #endif
@@ -11150,7 +11175,9 @@ os_cpu_count_impl(PyObject *module)
         ncpu = sysinfo.dwNumberOfProcessors;
     }
 #elif defined(__hpux)
-    ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
+    ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL); 
+#elif defined(__VXWORKS__)
+    ncpu = __builtin_popcount(vxCpuEnabledGet());
 #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
     ncpu = sysconf(_SC_NPROCESSORS_ONLN);
 #elif defined(__DragonFly__) || \
@@ -12933,11 +12960,13 @@ all_ins(PyObject *m)
     if (PyModule_AddIntMacro(m, F_TEST)) return -1;
 #endif
 
-#ifdef HAVE_SPAWNV
+#if defined(HAVE_SPAWNV) || defined (HAVE_RTPSPAWN)
     if (PyModule_AddIntConstant(m, "P_WAIT", _P_WAIT)) return -1;
     if (PyModule_AddIntConstant(m, "P_NOWAIT", _P_NOWAIT)) return -1;
-    if (PyModule_AddIntConstant(m, "P_OVERLAY", _OLD_P_OVERLAY)) return -1;
     if (PyModule_AddIntConstant(m, "P_NOWAITO", _P_NOWAITO)) return -1;
+#endif
+#if defined(HAVE_SPAWNV)
+    if (PyModule_AddIntConstant(m, "P_OVERLAY", _OLD_P_OVERLAY)) return -1;
     if (PyModule_AddIntConstant(m, "P_DETACH", _P_DETACH)) return -1;
 #endif
 

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -978,11 +978,18 @@ fill_siginfo(siginfo_t *si)
 
     PyStructSequence_SET_ITEM(result, 0, PyLong_FromLong((long)(si->si_signo)));
     PyStructSequence_SET_ITEM(result, 1, PyLong_FromLong((long)(si->si_code)));
+#ifdef __VXWORKS__   
+    PyStructSequence_SET_ITEM(result, 2, PyLong_FromLong(0L));
+    PyStructSequence_SET_ITEM(result, 3, PyLong_FromLong(0L));
+    PyStructSequence_SET_ITEM(result, 4, PyLong_FromLong(0L));
+    PyStructSequence_SET_ITEM(result, 5, PyLong_FromLong(0L));
+#else   
     PyStructSequence_SET_ITEM(result, 2, PyLong_FromLong((long)(si->si_errno)));
     PyStructSequence_SET_ITEM(result, 3, PyLong_FromPid(si->si_pid));
     PyStructSequence_SET_ITEM(result, 4, _PyLong_FromUid(si->si_uid));
     PyStructSequence_SET_ITEM(result, 5,
                                 PyLong_FromLong((long)(si->si_status)));
+#endif   
 #ifdef HAVE_SIGINFO_T_SI_BAND
     PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(si->si_band));
 #else

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -159,7 +159,7 @@ if_indextoname(index) -- return the corresponding interface name\n\
 # undef HAVE_GETHOSTBYNAME_R_6_ARG
 #endif
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__VXWORKS__)
 # include <sys/uio.h>
 #endif
 
@@ -181,6 +181,13 @@ if_indextoname(index) -- return the corresponding interface name\n\
 # endif
 #endif
 
+#ifdef __VXWORKS__
+# include <ipcom_sock2.h>
+# define gethostbyaddr_r  ipcom_gethostbyaddr_r
+# define h_errno  errno
+# include <hostLib.h>
+#endif
+
 #if !defined(HAVE_GETHOSTBYNAME_R) && !defined(MS_WINDOWS)
 # define USE_GETHOSTBYNAME_LOCK
 #endif
@@ -525,7 +532,7 @@ set_error(void)
     return PyErr_SetFromErrno(PyExc_OSError);
 }
 
-
+/*#ifndef __VXWORKS__ */
 static PyObject *
 set_herror(int h_error)
 {
@@ -543,7 +550,7 @@ set_herror(int h_error)
 
     return NULL;
 }
-
+/* #endif */
 
 static PyObject *
 set_gaierror(int error)
@@ -896,7 +903,7 @@ init_sockobject(PySocketSockObject *s,
     return 0;
 }
 
-
+#ifdef HAVE_SOCKETPAIR
 /* Create a new socket object.
    This just creates the object and initializes it.
    If the creation fails, return NULL and set an exception (implicit
@@ -916,7 +923,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto)
     }
     return s;
 }
-
+#endif
 
 /* Lock to allow python interpreter to continue, but only allow one
    thread to be in gethostbyname or getaddrinfo */
@@ -5419,6 +5426,7 @@ Return the service name from a port number and protocol name.\n\
 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
 otherwise any protocol will match.");
 
+#ifndef __VXWORKS__
 /* Python interface to getprotobyname(name).
    This only returns the protocol number, since the other info is
    already known or not useful (like the list of aliases). */
@@ -5445,7 +5453,7 @@ PyDoc_STRVAR(getprotobyname_doc,
 "getprotobyname(name) -> integer\n\
 \n\
 Return the protocol number for the named protocol.  (Rarely used.)");
-
+#endif
 
 #ifndef NO_DUP
 /* dup() function for socket fds */
@@ -6385,8 +6393,10 @@ static PyMethodDef socket_methods[] = {
      METH_VARARGS, getservbyname_doc},
     {"getservbyport",           socket_getservbyport,
      METH_VARARGS, getservbyport_doc},
+#ifndef __VXWORKS__
     {"getprotobyname",          socket_getprotobyname,
      METH_VARARGS, getprotobyname_doc},
+#endif
 #ifndef NO_DUP
     {"dup",                     socket_dup,
      METH_O, dup_doc},

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
@@ -54,6 +54,11 @@ Revision history:
 
 #include <syslog.h>
 
+#ifndef LOG_UPTO
+/* all priorities through pri */
+#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1)
+#endif
+
 /*  only one instance, only one syslog, so globals should be ok  */
 static PyObject *S_ident_o = NULL;                      /*  identifier, held by openlog()  */
 static char S_log_open = 0;

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -1421,13 +1421,15 @@ PyInit_timezone(PyObject *m) {
 #if defined(HAVE_TZNAME) && !defined(__GLIBC__) && !defined(__CYGWIN__)
     PyObject *otz0, *otz1;
     tzset();
+#ifndef __VXWORKS__
     PyModule_AddIntConstant(m, "timezone", timezone);
 #ifdef HAVE_ALTZONE
     PyModule_AddIntConstant(m, "altzone", altzone);
 #else
     PyModule_AddIntConstant(m, "altzone", timezone-3600);
 #endif
     PyModule_AddIntConstant(m, "daylight", daylight);
+#endif    
     otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape");
     otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape");
     PyModule_AddObject(m, "tzname", Py_BuildValue("(NN)", otz0, otz1));

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1426,6 +1426,10 @@ initfsencoding(PyInterpreterState *interp)
         Py_FileSystemDefaultEncoding = "utf-8";
         Py_FileSystemDefaultEncodeErrors = "surrogatepass";
     }
+#elif defined(__VXWORKS__)
+    {
+    Py_FileSystemDefaultEncoding = "ascii";
+    }
 #else
     if (Py_FileSystemDefaultEncoding == NULL)
     {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow cross-build of VxWorks if --host=*-wrs-vxworks is passed to configure