QNX / old compiler support

andrewleech · pi-anl · commit 55b92712d09b · 2022-08-22T11:01:23.000+10:00
diff --git a/extmod/axtls-include/axtls_os_port.h b/extmod/axtls-include/axtls_os_port.h
@@ -27,6 +27,7 @@
 #define AXTLS_OS_PORT_H
 
 #include <errno.h>
+#include <sys/time.h>
 #include "py/stream.h"
 #include "lib/crypto-algorithms/sha256.h"
 
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
@@ -200,6 +200,7 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
         }
 
         #ifdef _DIRENT_HAVE_D_TYPE
+
         #ifdef DTTOIF
         t->items[1] = MP_OBJ_NEW_SMALL_INT(DTTOIF(dirent->d_type));
         #else
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
@@ -17,7 +17,7 @@ INC += -I$(BUILD)
 INC += -I$(TOP)
 
 # compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall # -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
 CFLAGS += $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
@@ -31,7 +31,7 @@
 #define MICROPY_PERSISTENT_CODE_SAVE (1)
 
 #ifndef MICROPY_PERSISTENT_CODE_SAVE_FILE
-#if defined(__i386__) || defined(__x86_64__) || defined(_WIN32) || defined(__unix__) || defined(__APPLE__)
+#if defined(__i386__) || defined(__x86_64__) || defined(_WIN32) || defined(__unix__) || defined(__APPLE__) || defined(__QNX__)
 #define MICROPY_PERSISTENT_CODE_SAVE_FILE (1)
 #else
 #define MICROPY_PERSISTENT_CODE_SAVE_FILE (0)
@@ -119,7 +119,7 @@ typedef long mp_off_t;
 #define MP_PLAT_PRINT_STRN(str, len) (void)0
 
 // We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__QNX__)
 #include <stdlib.h>
 #elif defined(_WIN32)
 #include <malloc.h>
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
@@ -37,8 +37,8 @@ INC +=  -I$(TOP)
 INC += -I$(BUILD)
 
 # compiler settings
-CWARN = -Wall -Werror
-CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
+CWARN = -Wall #-Werror
+CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
 CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
@@ -100,7 +100,8 @@ else
 # Use gcc syntax for map file
 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif
-LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
+LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm 
+$(LDFLAGS_EXTRA)
 
 # Flags to link with pthread library
 LIBPTHREAD = -lpthread
@@ -127,10 +128,18 @@ endif
 ifeq ($(MICROPY_PY_SOCKET),1)
 CFLAGS_MOD += -DMICROPY_PY_SOCKET=1
 SRC_MOD += modusocket.c
+ifeq ($(CROSS_COMPILE),ntoarmv7-)
+LDFLAGS_MOD += -Wl,-R/mnt/app/armle/lib -Wl,-R/lib -lsocket
+endif
 endif
 ifeq ($(MICROPY_PY_THREAD),1)
 CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
+
+ifneq ($(CROSS_COMPILE),ntoarmv7-)
 LDFLAGS_MOD += $(LIBPTHREAD)
+else
+# on qnx pthread is included in libc
+endif
 endif
 
 ifeq ($(MICROPY_PY_USSL),1)
@@ -212,14 +221,19 @@ LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/inclu
   LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a
  endif
 else
-# Use system version of libffi.
-LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
-LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
+#LIBFFI_CFLAGS_MOD := $(shell pkg-config --static --cflags libffi)
+#LIBFFI_LDFLAGS_MOD := $(shell pkg-config --static --libs libffi)
+##PKG_CONFIG_PATH=/mnt/app/pkg/lib/pkgconfig pkg-config --static --cflags libffi
+LIBFFI_CFLAGS_MOD := -I/mnt/app/pkg/include
+LIBFFI_LDFLAGS_MOD := -L/mnt/app/pkg/lib -l:libffi.a
 endif
 
+
+ifneq ($(CROSS_COMPILE),ntoarmv7-)
 ifeq ($(UNAME_S),Linux)
 LIBFFI_LDFLAGS_MOD += -ldl
 endif
+endif
 
 CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
 LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
diff --git a/ports/unix/build.sh b/ports/unix/build.sh
@@ -0,0 +1,16 @@
+export LC_ALL="en_US.UTF-8" 
+export LC_CTYPE="en_US.UTF-8" 
+export LANG="C.UTF-8" 
+
+gmake \
+ CROSS_COMPILE=ntoarmv7- V=1 \
+ CFLAGS_EXTRA=" \
+    -static -static-libgcc \
+    -DMP_ENDIANNESS_LITTLE=1 \
+    -Wno-missing-field-initializers -Wno-strict-aliasing \
+    -D_DIRENT_HAVE_D_TYPE=0 \
+  " \
+  MPY_LIB_DIR=../../../../packages/micropython-lib \
+  MICROPY_STANDALONE=0 VARIANT=ext MICROPY_PY_BLUETOOTH=0 \
+  FROZEN_MANIFEST=../../../../packages/manifest.py \
+  PROG=micropython
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
@@ -307,9 +307,9 @@ static inline unsigned long mp_urandom_seed_init(void) {
 // the macros [...], _DIRENT_HAVE_D_TYPE are defined."
 // Other libc's don't define it, but proactively assume that dirent->d_type
 // is available on a modern *nix system.
-#ifndef _DIRENT_HAVE_D_TYPE
-#define _DIRENT_HAVE_D_TYPE (1)
-#endif
+// #ifndef _DIRENT_HAVE_D_TYPE
+// #define _DIRENT_HAVE_D_TYPE (1)
+// #endif
 // This macro is not provided by glibc but we need it so ports that don't have
 // dirent->d_ino can disable the use of this field.
 #ifndef _DIRENT_HAVE_D_INO
diff --git a/ports/unix/variants/ext/mpconfigvariant.h b/ports/unix/variants/ext/mpconfigvariant.h
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MICROPY_READER_VFS                      (1)
+#define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
+#define MICROPY_ENABLE_SCHEDULER                (1)
+#define MICROPY_VFS                             (1)
+#define MICROPY_VFS_POSIX                       (1)
+
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+#define MICROPY_PY_SYS_SETTRACE                 (1)
+#define MICROPY_PY_UOS_VFS                      (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
+
+#ifndef MICROPY_PY_UASYNCIO
+#define MICROPY_PY_UASYNCIO                     (1)
+#endif
+
+
+#define MICROPY_OPT_MATH_FACTORIAL     (1)
+#define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
+#define MICROPY_ENABLE_SCHEDULER       (1)
+#define MICROPY_MODULE_GETATTR         (1)
+#define MICROPY_PY_DELATTR_SETATTR     (1)
+#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (1)
+#define MICROPY_PY_BUILTINS_NEXT2      (1)
+#define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
+#define MICROPY_PY_SYS_GETSIZEOF       (1)
+#define MICROPY_PY_MATH_FACTORIAL      (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
+#define MICROPY_PY_IO_BUFFEREDWRITER (1)
+#define MICROPY_PY_IO_RESOURCE_STREAM (1)
+#define MICROPY_PY_URE_MATCH_GROUPS    (1)
+#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
+#define MICROPY_PY_URE_SUB             (1)
+#define MICROPY_PY_FRAMEBUF            (1)
+#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
+#define MICROPY_PY_UCRYPTOLIB          (1)
+#define MICROPY_PY_UCRYPTOLIB_CTR      (1)
+
+
+// Use vfs's functions for import stat and builtin open.
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open mp_vfs_open
+#define mp_builtin_open_obj mp_vfs_open_obj
diff --git a/ports/unix/variants/ext/mpconfigvariant.mk b/ports/unix/variants/ext/mpconfigvariant.mk
@@ -0,0 +1,10 @@
+PROG ?= micropython-dev
+
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+
+MICROPY_ROM_TEXT_COMPRESSION = 1
+MICROPY_VFS_FAT = 1
+MICROPY_VFS_LFS1 = 1
+MICROPY_VFS_LFS2 = 1
+
+MICROPY_PY_BLUETOOTH ?= 1
diff --git a/py/compile.c b/py/compile.c
@@ -3429,7 +3429,7 @@ STATIC
 #endif
 mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_module_context_t *context) {
     // put compiler state on the stack, it's relatively small
-    compiler_t comp_state = {0};
+    compiler_t comp_state = {0,};
     compiler_t *comp = &comp_state;
 
     comp->is_repl = is_repl;
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
@@ -63,6 +63,10 @@ def get_version_info_from_git():
 
 
 def get_version_info_from_docs_conf():
+    print(os.path.join(os.path.dirname(sys.argv[0]), "..", "docs", "conf.py"))
+    for key in sorted(os.environ):
+      print("export %s=%s" % (key, os.environ[key]))
+    print(sys.executable)
     with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "docs", "conf.py")) as f:
         for line in f:
             if line.startswith("version = release = '"):
diff --git a/py/misc.h b/py/misc.h
@@ -33,9 +33,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <sys/types.h>
 
 typedef unsigned char byte;
-typedef unsigned int uint;
+//typedef unsigned int uint;
 
 /** generic ops *************************************************/
 
diff --git a/py/mpstate.c b/py/mpstate.c
@@ -27,7 +27,7 @@
 #include "py/mpstate.h"
 
 #if MICROPY_DYNAMIC_COMPILER
-mp_dynamic_compiler_t mp_dynamic_compiler = {0};
+mp_dynamic_compiler_t mp_dynamic_compiler = {0, 0, 0, 0, 0};
 #endif
 
 mp_state_ctx_t mp_state_ctx;
diff --git a/py/nativeglue.c b/py/nativeglue.c
@@ -307,7 +307,7 @@ const mp_fun_table_t mp_fun_table = {
     mp_small_int_modulo,
     mp_native_yield_from,
     #if MICROPY_NLR_SETJMP
-    setjmp,
+    _setjmp,
     #else
     NULL,
     #endif
diff --git a/py/nlr.h b/py/nlr.h
@@ -63,7 +63,7 @@
     #else
         #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_X64)
     #endif
-#elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
+#elif (defined(__thumb2__) || defined(__thumb__) || defined(__arm__)) && !defined(__QNX__)
     #define MICROPY_NLR_THUMB (1)
     #if defined(__SOFTFP__)
         #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_ARM_THUMB)

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`#ifdef _DIRENT_HAVE_D_TYPE`
	`203`	`+`
`203`	`204`	`#ifdef DTTOIF`
`204`	`205`	`t->items[1] = MP_OBJ_NEW_SMALL_INT(DTTOIF(dirent->d_type));`
`205`	`206`	`#else`