Skip to content

Commit 1d13c4c

Browse files
jeplerjepler
committed
Centralize LONGINT_IMPL handling
This closes #5782
1 parent 3dcebf1 commit 1d13c4c

File tree

10 files changed

+28
-82
lines changed

10 files changed

+28
-82
lines changed

‎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/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

‎py/circuitpy_defns.mk‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,6 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
8585
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
8686
endif
8787

88-
89-
###
90-
# Propagate longint choice from .mk to C. There's no easy string comparison
91-
# in cpp conditionals, so we #define separate names for each.
92-
ifeq ($(LONGINT_IMPL),NONE)
93-
CFLAGS += -DLONGINT_IMPL_NONE
94-
endif
95-
96-
ifeq ($(LONGINT_IMPL),MPZ)
97-
CFLAGS += -DLONGINT_IMPL_MPZ
98-
endif
99-
100-
ifeq ($(LONGINT_IMPL),LONGLONG)
101-
CFLAGS += -DLONGINT_IMPL_LONGLONG
102-
endif
103-
104-
10588
###
10689
# Select which builtin modules to compile and include.
10790

‎py/circuitpy_mpconfig.mk‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,3 +462,31 @@ CFLAGS += -DCIRCUITPY_WATCHDOG=$(CIRCUITPY_WATCHDOG)
462462

463463
CIRCUITPY_WIFI ?= 0
464464
CFLAGS += -DCIRCUITPY_WIFI=$(CIRCUITPY_WIFI)
465+
466+
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
467+
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
468+
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
469+
#
470+
# Also propagate longint choice from .mk to C. There's no easy string comparison
471+
# in cpp conditionals, so we #define separate names for each.
472+
473+
ifeq ($(LONGINT_IMPL),NONE)
474+
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
475+
CFLAGS += -DLONGINT_IMPL_NONE
476+
else ifeq ($(LONGINT_IMPL),MPZ)
477+
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
478+
CFLAGS += -DLONGINT_IMPL_MPZ
479+
else ifeq ($(LONGINT_IMPL),LONGLONG)
480+
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
481+
CFLAGS += -DLONGINT_IMPL_LONGLONG
482+
else
483+
$(error LONGINT_IMPL set to surprising value: "$(LONGINT_IMPL)")
484+
endif
485+
486+
###
487+
ifeq ($(LONGINT_IMPL),NONE)
488+
else ifeq ($(LONGINT_IMPL),MPZ)
489+
else ifeq ($(LONGINT_IMPL),LONGLONG)
490+
else
491+
$(error LONGINT_IMPL set to surprising value: "$(LONGINT_IMPL)")
492+
endif

0 commit comments

Comments
 (0)