make longint choice mechanism more readable

22 files changed, 28 insertions, 40 deletions

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 1fdeab5f5..86f656a42 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -165,16 +165,17 @@ ifndef INTERNAL_LIBM
 LIBS += -lm
 endif
 
-# Propagate longint choice from .mk to C.
-ifdef LONGINT_IMPL_NONE
+# Propagate longint choice from .mk to C. There's no easy string comparison
+# in cpp coniditionals, so we #define separate names for each.
+ifeq ($(LONGINT_IMPL),NONE)
 CFLAGS += -DLONGINT_IMPL_NONE
 endif
 
-ifdef LONGINT_IMPL_MPZ
+ifeq ($(LONGINT_IMPL),MPZ)
 CFLAGS += -DLONGINT_IMPL_MPZ
 endif
 
-ifdef LONGINT_IMPL_LONGLONG
+ifeq ($(LONGINT_IMPL),LONGLONG)
 CFLAGS += -DLONGINT_IMPL_LONGLONG
 endif
 
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index 638c76e1f..017e66ddf 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Arduino Zero"
 USB_MANUFACTURER = "Arduino"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
index a3580923c..831106adc 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@@ -5,13 +5,11 @@ USB_PRODUCT = "CircuitPlayground Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index 47be11ed4..d852b4d47 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -5,13 +5,11 @@ USB_PRODUCT = "CircuitPlayground Express with Crickit libraries"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 4971ad234..4f2855d73 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 Adalogger"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
index 2dfd8dba9..a77da91f2 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
index c24eb0673..d4725fdf4 100644
--- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@@ -5,9 +5,7 @@ USB_PRODUCT = "Feather M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 5c1cea8e0..bd1a96479 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 RFM69"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index b0fc39564..fedd8d072 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 RFM9x"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
index e974b921b..79bf2d34a 100644
--- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 Supersized"
 USB_MANUFACTURER = "Dave Astels"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
index 061767c71..01385bdc6 100644
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 QSPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD51G19A
 CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
index 01329bc32..ddc4287c3 100644
--- a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Gemma M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
index d1ef58049..66586b611 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
@@ -5,9 +5,7 @@ USB_PRODUCT = "Itsy Bitsy M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
index 00f4976a3..27f5ea2b8 100644
--- a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "ItsyBitsy M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 QSPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD51G19A
 CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
index d449b65e1..0388a408b 100644
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -5,9 +5,7 @@ USB_PRODUCT = "Metro M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
index 473690cd7..38e8a12d7 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Metro M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 QSPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD51J19A
 CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
index a225067ea..9e6965063 100644
--- a/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Metro M4 Express Rev B (Black)"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD51J19A
 CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
index fbfa2c9ec..87b46c642 100644
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "pIRKey M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
index 65ecec0e2..c9c45152b 100644
--- a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT = "Trinket M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_NONE = 1
+LONGINT_IMPL = NONE
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
index 95996085f..d97aa08ab 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@@ -5,7 +5,7 @@ USB_PRODUCT="Trinket M0 Haxpress"
 USB_MANUFACTURER="Radomir Dopieralski"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index fee23b94d..f30434025 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -6,7 +6,7 @@ USB_PRODUCT = "uGame10"
 USB_MANUFACTURER = "Radomir Dopieralski"
 
 SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL_MPZ = 1
+LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 25e40af37..e7aeb0805 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -2,20 +2,17 @@
 # $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
 # This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
 
-ifdef LONGINT_IMPL_NONE
+ifeq ($(LONGINT_IMPL),NONE)
 MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
 endif
 
-ifdef LONGINT_IMPL_MPZ
+ifeq ($(LONGINT_IMPL),MPZ)
 MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
 endif
 
-ifdef LONGINT_IMPL_LONGLONG
+ifeq ($(LONGINT_IMPL),LONGONG)
 MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
 endif
 
-ifndef MPY_TOOL_LONGINT_IMPL
-$(error one of LONGINT_IMPL_NONE, LONGINT_IMPL_MPZ, or LONGINT_IMPL_LONGLONG must be defined)
-endif
 
 INTERNAL_LIBM = 1