From be3d7f91e5c71f3736cd85ce7016f2b5629cd6e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 16 Feb 2017 17:23:06 +1100
Subject: py/nlr.h: Mark nlr_jump_fail as NORETURN.

---
 bare-arm/main.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bare-arm')

diff --git a/bare-arm/main.c b/bare-arm/main.c
index e6ce06398..99a7f926e 100644
--- a/bare-arm/main.c
+++ b/bare-arm/main.c
@@ -48,6 +48,7 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 void nlr_jump_fail(void *val) {
+    while (1);
 }
 
 void NORETURN __fatal_error(const char *msg) {
-- 
cgit v1.2.3


From c72a5f8c79514ac93b62e1a767a5d413105d7dd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 14 Mar 2017 11:24:26 +1100
Subject: bare-arm/main: Move lexer constructor to within NLR handler block.

And raise an exception when mp_lexer_new_from_file is called.
---
 bare-arm/main.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'bare-arm')

diff --git a/bare-arm/main.c b/bare-arm/main.c
index 99a7f926e..938414dfe 100644
--- a/bare-arm/main.c
+++ b/bare-arm/main.c
@@ -6,15 +6,12 @@
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
+#include "py/mperrno.h"
 
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
-    mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
-    if (lex == NULL) {
-        return;
-    }
-
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
+        mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
         qstr source_name = lex->source_name;
         mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
         mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
@@ -35,7 +32,7 @@ int main(int argc, char **argv) {
 }
 
 mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    return NULL;
+    mp_raise_OSError(MP_ENOENT);
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
-- 
cgit v1.2.3


From 75589272ef12d538ab7ce4f4453be85d826b5083 Mon Sep 17 00:00:00 2001
From: Krzysztof Blazewicz <blazewicz.krzysztof@gmail.com>
Date: Sun, 5 Mar 2017 13:28:27 +0100
Subject: all/Makefile: Remove -ansi from GCC flags, its ignored anyway.

The -ansi flag is used for C dialect selection and it is equivalent to -std=c90.
Because it goes right before -std=gnu99 it is ignored as for conflicting flags
GCC always uses the last one.
---
 bare-arm/Makefile                  | 2 +-
 cc3200/Makefile                    | 2 +-
 esp8266/Makefile                   | 2 +-
 examples/embedding/Makefile.upylib | 2 +-
 minimal/Makefile                   | 4 ++--
 mpy-cross/Makefile                 | 2 +-
 pic16bit/Makefile                  | 2 +-
 qemu-arm/Makefile                  | 2 +-
 stmhal/Makefile                    | 2 +-
 teensy/Makefile                    | 2 +-
 unix/Makefile                      | 2 +-
 windows/Makefile                   | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'bare-arm')

diff --git a/bare-arm/Makefile b/bare-arm/Makefile
index a57ccfd19..6ee855262 100644
--- a/bare-arm/Makefile
+++ b/bare-arm/Makefile
@@ -13,7 +13,7 @@ INC += -I..
 INC += -I$(BUILD)
 
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
diff --git a/cc3200/Makefile b/cc3200/Makefile
index 4db3b9e8d..663496435 100644
--- a/cc3200/Makefile
+++ b/cc3200/Makefile
@@ -20,7 +20,7 @@ include ../py/mkenv.mk
 CROSS_COMPILE ?= arm-none-eabi-
 
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
+CFLAGS = -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
 CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += $(CFLAGS_MOD)
diff --git a/esp8266/Makefile b/esp8266/Makefile
index 5e61fc16d..4710f4cdc 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -41,7 +41,7 @@ CFLAGS_XTENSA = -fsingle-precision-constant -Wdouble-promotion \
 	-Wl,-EL -mlongcalls -mtext-section-literals -mforce-l32 \
 	-DLWIP_OPEN_SRC
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib -DUART_OS=$(UART_OS) \
+CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib -DUART_OS=$(UART_OS) \
 	$(CFLAGS_XTENSA) $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 
 LDSCRIPT = esp8266.ld
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index d8dbade3f..8b506e95e 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -20,7 +20,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS = $(INC) $(CWARN) -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG
diff --git a/minimal/Makefile b/minimal/Makefile
index 411751735..42c2d5312 100644
--- a/minimal/Makefile
+++ b/minimal/Makefile
@@ -22,9 +22,9 @@ ifeq ($(CROSS), 1)
 DFU = ../tools/dfu.py
 PYDFU = ../tools/pydfu.py
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 else
-CFLAGS = -m32 $(INC) -Wall -Werror -ansi -std=gnu99 $(COPT)
+CFLAGS = -m32 $(INC) -Wall -Werror -std=gnu99 $(COPT)
 endif
 
 #Debugging/Optimization
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 3f9956620..3d5e5da2f 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -19,7 +19,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS = $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
 
 # Debugging/Optimization
diff --git a/pic16bit/Makefile b/pic16bit/Makefile
index cfe8af86e..add9a8495 100644
--- a/pic16bit/Makefile
+++ b/pic16bit/Makefile
@@ -21,7 +21,7 @@ INC += -I$(XC16)/include
 INC += -I$(XC16)/support/$(PARTFAMILY)/h
 
 CFLAGS_PIC16BIT = -mcpu=$(PART) -mlarge-code
-CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_PIC16BIT) $(COPT)
+CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_PIC16BIT) $(COPT)
 
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
diff --git a/qemu-arm/Makefile b/qemu-arm/Makefile
index 61fc24364..e8f5b359e 100644
--- a/qemu-arm/Makefile
+++ b/qemu-arm/Makefile
@@ -15,7 +15,7 @@ INC += -I$(BUILD)
 INC += -I../tools/tinytest/
 
 CFLAGS_CORTEX_M3 = -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 $(CFLAGS_CORTEX_M3) $(COPT) \
+CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 $(CFLAGS_CORTEX_M3) $(COPT) \
 	 -ffunction-sections -fdata-sections
 
 #Debugging/Optimization
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 76579d130..3eef6ffb2 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -56,7 +56,7 @@ CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES
 CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7 -DMCU_SERIES_F7
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES_L4
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_MOD)
+CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD)
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
diff --git a/teensy/Makefile b/teensy/Makefile
index 82e04a1ae..e613b8f27 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -36,7 +36,7 @@ INC += -I../lib/mp-readline
 INC += -I$(BUILD)
 INC += -Icore
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4)
+CFLAGS = $(INC) -Wall -Wpointer-arith -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4)
 LDFLAGS = -nostdlib -T mk20dx256.ld -msoft-float -mfloat-abi=soft
 
 ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
diff --git a/unix/Makefile b/unix/Makefile
index 83bd3f984..f28a4bcae 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -23,7 +23,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS = $(INC) $(CWARN) -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG
diff --git a/windows/Makefile b/windows/Makefile
index 68de66a07..72c97381b 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -15,7 +15,7 @@ INC += -I..
 INC += -I$(BUILD)
 
 # compiler settings
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT)
+CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT)
 LDFLAGS = $(LDFLAGS_MOD) -lm
 
 # Debugging/Optimization
-- 
cgit v1.2.3


From 4afa782fb415165aa6e7f9eea8532f0d2493f8ce Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 23 Mar 2017 15:41:04 +1100
Subject: bare-arm/Makefile: Change C standard from gnu99 to c99.

---
 bare-arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bare-arm')

diff --git a/bare-arm/Makefile b/bare-arm/Makefile
index 6ee855262..cfd427c60 100644
--- a/bare-arm/Makefile
+++ b/bare-arm/Makefile
@@ -13,7 +13,7 @@ INC += -I..
 INC += -I$(BUILD)
 
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
-- 
cgit v1.2.3


From 4c307bfba1e5ffa3cec94bd63ba19ba6c322883b Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 1 Apr 2017 11:39:38 +1100
Subject: all: Move BYTES_PER_WORD definition from ports to py/mpconfig.h

It can still be overwritten by a port in mpconfigport.h but for almost
all cases one can use the provided default.
---
 bare-arm/mpconfigport.h                   | 2 --
 cc3200/mpconfigport.h                     | 1 -
 esp8266/mpconfigport.h                    | 2 --
 examples/embedding/mpconfigport_minimal.h | 2 --
 minimal/mpconfigport.h                    | 2 --
 mpy-cross/mpconfigport.h                  | 2 --
 pic16bit/mpconfigport.h                   | 1 -
 py/mpconfig.h                             | 5 +++++
 qemu-arm/mpconfigport.h                   | 2 --
 stmhal/mpconfigport.h                     | 2 --
 teensy/mpconfigport.h                     | 2 --
 unix/mpconfigport.h                       | 2 --
 unix/mpconfigport_minimal.h               | 2 --
 windows/mpconfigport.h                    | 2 --
 zephyr/mpconfigport.h                     | 2 --
 zephyr/mpconfigport_minimal.h             | 2 --
 16 files changed, 5 insertions(+), 28 deletions(-)

(limited to 'bare-arm')

diff --git a/bare-arm/mpconfigport.h b/bare-arm/mpconfigport.h
index 912fae66f..97e866bdb 100644
--- a/bare-arm/mpconfigport.h
+++ b/bare-arm/mpconfigport.h
@@ -46,8 +46,6 @@
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
 
 #define UINT_FMT "%lu"
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
index a8dc0cfeb..4d19900ae 100644
--- a/cc3200/mpconfigport.h
+++ b/cc3200/mpconfigport.h
@@ -200,7 +200,6 @@ extern const struct _mp_obj_module_t mp_module_ussl;
 
 
 // type definitions for the specific machine
-#define BYTES_PER_WORD                              (4)
 #define MICROPY_MAKE_POINTER_CALLABLE(p)            ((void*)((mp_uint_t)(p) | 1))
 #define MP_SSIZE_MAX                                (0x7FFFFFFF)
 
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
index 07bd48f67..d40eaba91 100644
--- a/esp8266/mpconfigport.h
+++ b/esp8266/mpconfigport.h
@@ -118,8 +118,6 @@
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p)))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 48d200858..d16827fa3 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -119,8 +119,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 #endif
 
-#define BYTES_PER_WORD sizeof(mp_int_t)
-
 // Cannot include <sys/types.h>, as it may lead to symbol name clashes
 #if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
 typedef long long mp_off_t;
diff --git a/minimal/mpconfigport.h b/minimal/mpconfigport.h
index e08943860..47fc98429 100644
--- a/minimal/mpconfigport.h
+++ b/minimal/mpconfigport.h
@@ -57,8 +57,6 @@
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
 
 // This port is intended to be 32-bit, but unfortunately, int32_t for
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 0f7651098..383de1439 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -100,8 +100,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 #endif
 
-#define BYTES_PER_WORD sizeof(mp_int_t)
-
 // Cannot include <sys/types.h>, as it may lead to symbol name clashes
 #if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
 typedef long long mp_off_t;
diff --git a/pic16bit/mpconfigport.h b/pic16bit/mpconfigport.h
index a0371a8ae..e4113956b 100644
--- a/pic16bit/mpconfigport.h
+++ b/pic16bit/mpconfigport.h
@@ -68,7 +68,6 @@
 // type definitions for the specific machine
 
 #define MP_ENDIANNESS_LITTLE        (1)
-#define BYTES_PER_WORD              (2)
 #define MPZ_DIG_SIZE                (8)
 
 // The xc16 compiler doesn't seem to respect alignment (!!) so we
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 54cf0f3d3..9c89fc18a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1105,6 +1105,11 @@ typedef double mp_float_t;
 #define STATIC static
 #endif
 
+// Number of bytes in a word
+#ifndef BYTES_PER_WORD
+#define BYTES_PER_WORD (sizeof(mp_uint_t))
+#endif
+
 #define BITS_PER_BYTE (8)
 #define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
 // mp_int_t value with most significant bit set
diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h
index f642c6428..974d3520b 100644
--- a/qemu-arm/mpconfigport.h
+++ b/qemu-arm/mpconfigport.h
@@ -39,8 +39,6 @@
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
index 339360bae..3f3683199 100644
--- a/stmhal/mpconfigport.h
+++ b/stmhal/mpconfigport.h
@@ -264,8 +264,6 @@ extern const struct _mp_obj_module_t mp_module_network;
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h
index 07f60c43f..8c4022046 100644
--- a/teensy/mpconfigport.h
+++ b/teensy/mpconfigport.h
@@ -54,8 +54,6 @@ extern const struct _mp_obj_module_t time_module;
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
 
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index a85884594..7ecfc28c0 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -233,8 +233,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
 #endif
 #endif
 
-#define BYTES_PER_WORD sizeof(mp_int_t)
-
 // Cannot include <sys/types.h>, as it may lead to symbol name clashes
 #if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
 typedef long long mp_off_t;
diff --git a/unix/mpconfigport_minimal.h b/unix/mpconfigport_minimal.h
index 65e35c8d9..788c8519d 100644
--- a/unix/mpconfigport_minimal.h
+++ b/unix/mpconfigport_minimal.h
@@ -127,8 +127,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 #endif
 
-#define BYTES_PER_WORD sizeof(mp_int_t)
-
 // Cannot include <sys/types.h>, as it may lead to symbol name clashes
 #if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
 typedef long long mp_off_t;
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
index 6156ad39e..844e2618f 100644
--- a/windows/mpconfigport.h
+++ b/windows/mpconfigport.h
@@ -128,8 +128,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 #endif
 
-#define BYTES_PER_WORD sizeof(mp_int_t)
-
 // Just assume Windows is little-endian - mingw32 gcc doesn't
 // define standard endianness macros.
 #define MP_ENDIANNESS_LITTLE (1)
diff --git a/zephyr/mpconfigport.h b/zephyr/mpconfigport.h
index e0586dcfc..0949d1374 100644
--- a/zephyr/mpconfigport.h
+++ b/zephyr/mpconfigport.h
@@ -99,8 +99,6 @@ typedef void *machine_ptr_t; // must be of pointer size
 typedef const void *machine_const_ptr_t; // must be of pointer size
 typedef long mp_off_t;
 
-#define BYTES_PER_WORD (sizeof(mp_int_t))
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/zephyr/mpconfigport_minimal.h b/zephyr/mpconfigport_minimal.h
index 04383f6e3..772335c0a 100644
--- a/zephyr/mpconfigport_minimal.h
+++ b/zephyr/mpconfigport_minimal.h
@@ -85,8 +85,6 @@ typedef void *machine_ptr_t; // must be of pointer size
 typedef const void *machine_const_ptr_t; // must be of pointer size
 typedef long mp_off_t;
 
-#define BYTES_PER_WORD (sizeof(mp_int_t))
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-- 
cgit v1.2.3