Skip to content

Commit 3bc4880

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#5783 from jepler/longint-config
Centralize LONGINT_IMPL handling
2 parents 2c4e3aa + 9cf2baf commit 3bc4880

12 files changed

Lines changed: 29 additions & 98 deletions

File tree

‎ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CHIP_FAMILY = samd51
88

99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
11+
LONGINT_IMPL = MPZ
1112

1213
# No I2S on SAMD51G.
1314
CIRCUITPY_AUDIOBUSIO = 0

‎ports/atmel-samd/mpconfigport.mk‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
# parameters that vary based on chip and/or board.
33
LD_TEMPLATE_FILE = boards/common.template.ld
44

5-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
6-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
7-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
8-
9-
ifeq ($(LONGINT_IMPL),NONE)
10-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
11-
endif
12-
13-
ifeq ($(LONGINT_IMPL),MPZ)
14-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
15-
endif
16-
17-
ifeq ($(LONGINT_IMPL),LONGLONG)
18-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
19-
endif
20-
215
INTERNAL_LIBM = 1
226

237
# Number of USB endpoint pairs.

‎ports/broadcom/mpconfigport.mk‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
5-
ifeq ($(LONGINT_IMPL),NONE)
6-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
7-
endif
8-
9-
ifeq ($(LONGINT_IMPL),MPZ)
10-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
11-
endif
12-
13-
ifeq ($(LONGINT_IMPL),LONGLONG)
14-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
15-
endif
16-
171
# All broadcom ports have longints.
182
LONGINT_IMPL = MPZ
193

‎ports/cxd56/mpconfigport.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ USB_HIGHSPEED = 1
33
# Number of USB endpoint pairs.
44
USB_NUM_ENDPOINT_PAIRS = 6
55

6-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
7-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
8-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
9-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
10-
116
# Longints can be implemented as mpz, as longlong, or not
127
LONGINT_IMPL = MPZ
138

‎ports/espressif/mpconfigport.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
5-
61
# Internal math library is substantially smaller than toolchain one
72
INTERNAL_LIBM = 1
83

‎ports/litex/mpconfigport.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
5-
61
# Internal math library is substantially smaller than toolchain one
72
INTERNAL_LIBM = 1
83

‎ports/mimxrt10xx/mpconfigport.mk‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
LD_FILE = $(FLASH).ld $(CHIP_FAMILY).ld imxrt10xx.ld
22

3-
ifeq ($(LONGINT_IMPL),NONE)
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
5-
endif
6-
7-
ifeq ($(LONGINT_IMPL),MPZ)
8-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
9-
endif
10-
11-
ifeq ($(LONGINT_IMPL),LONGLONG)
12-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
13-
endif
14-
153
INTERNAL_LIBM = 1
164

175
USB_HIGHSPEED = 1

‎ports/nrf/mpconfigport.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
# parameters that vary based on chip and/or board.
33
LD_TEMPLATE_FILE = boards/common.template.ld
44

5-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
6-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
7-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
8-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
9-
105
INTERNAL_LIBM = 1
116

127
# Number of USB endpoint pairs.

‎ports/raspberrypi/mpconfigport.mk‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
5-
ifeq ($(LONGINT_IMPL),NONE)
6-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
7-
endif
8-
9-
ifeq ($(LONGINT_IMPL),MPZ)
10-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
11-
endif
12-
13-
ifeq ($(LONGINT_IMPL),LONGLONG)
14-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
15-
endif
16-
171
# All raspberrypi ports have longints.
182
LONGINT_IMPL = MPZ
193

‎ports/stm/mpconfigport.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
MPY_TOOL_LONGINT_IMPL ?= -mlongint-impl=mpz
21
LONGINT_IMPL ?= MPZ
32
INTERNAL_LIBM ?= 1
43

0 commit comments

Comments
 (0)