Skip to content

py/dynruntime.mk: Let natmods be built with Clang. #19308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
agatti wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

py/dynruntime.mk: Let natmods be built with Clang. #19308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3bf141
py/dynruntime.mk: Let natmods be built with Clang.
agatti Jun 4, 2026
2915d84
examples/natmod/deflate: Fix build with Clang.
agatti Jun 4, 2026
12551ff
examples/natmod/framebuf: Fix build with Clang.
agatti Jun 4, 2026
6adecfb
examples/natmod/re: Fix build with Clang.
agatti Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions examples/natmod/deflate/deflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,20 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a

MP_DYNRUNTIME_INIT_EXIT
}

// On x86 and x64 (at least) Clang brings in its own memset() implementation,
// which will check at runtime which CPU features are available and then pick
// the fastest implementation depending on the running environment.
//
// This unfortunately includes a series of dependencies that do have a
// non-empty data section, which is currently not supported. Therefore if we
// detect Clang we provide our own naïve memset implementation.

#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
__attribute__((weak)) void *memset(void *pointer, int character, size_t length) {
for (size_t index = 0; index < length; ++index) {
((char *)pointer)[index] = (char)character;
}
return pointer;
}
#endif
17 changes: 17 additions & 0 deletions examples/natmod/framebuf/framebuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,20 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a

MP_DYNRUNTIME_INIT_EXIT
}

// On x86 and x64 (at least) Clang brings in its own memset() implementation,
// which will check at runtime which CPU features are available and then pick
// the fastest implementation depending on the running environment.
//
// This unfortunately includes a series of dependencies that do have a
// non-empty data section, which is currently not supported. Therefore if we
// detect Clang we provide our own naïve memset implementation.

#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
__attribute__((weak)) void *memset(void *pointer, int character, size_t length) {
for (size_t index = 0; index < length; ++index) {
((char *)pointer)[index] = (char)character;
}
return pointer;
}
#endif
17 changes: 17 additions & 0 deletions examples/natmod/re/re.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,20 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a

MP_DYNRUNTIME_INIT_EXIT
}

// On x86 and x64 (at least) Clang brings in its own memset() implementation,
// which will check at runtime which CPU features are available and then pick
// the fastest implementation depending on the running environment.
//
// This unfortunately includes a series of dependencies that do have a
// non-empty data section, which is currently not supported. Therefore if we
// detect Clang we provide our own naïve memset implementation.

#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
__attribute__((weak)) void *memset(void *pointer, int character, size_t length) {
for (size_t index = 0; index < length; ++index) {
((char *)pointer)[index] = (char)character;
}
return pointer;
}
#endif
23 changes: 16 additions & 7 deletions py/dynruntime.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# MPY_DIR must be set to the top of the MicroPython source tree

BUILD ?= build
CC ?= gcc

ECHO = @echo
RM = /bin/rm
Expand Down Expand Up @@ -104,13 +105,15 @@ MICROPY_FLOAT_IMPL ?= float
else ifeq ($(ARCH),rv32imc)

# rv32imc
ifeq ($(firstword $(shell $(CC) --version)),gcc)
CROSS = riscv64-unknown-elf-
endif
CFLAGS_ARCH += -march=rv32imac -mabi=ilp32 -mno-relax
# If Picolibc is available then select it explicitly. Ubuntu 24.04 ships its
# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
# is "nosys" so a value must be provided. To avoid having per-distro
# workarounds, always select Picolibc if available.
PICOLIBC_SPECS := $(shell $(CROSS)gcc --print-file-name=picolibc.specs)
PICOLIBC_SPECS := $(shell $(CROSS)$(CC) --print-file-name=picolibc.specs)
ifneq ($(PICOLIBC_SPECS),picolibc.specs)
CFLAGS_ARCH += -specs=$(PICOLIBC_SPECS)
USE_PICOLIBC := 1
Expand All @@ -123,13 +126,15 @@ MICROPY_FLOAT_IMPL ?= none
else ifeq ($(ARCH),rv64imc)

# rv64imc
ifeq ($(firstword $(shell $(CC) --version)),gcc)
CROSS = riscv64-unknown-elf-
endif
CFLAGS_ARCH += -march=rv64imac -mabi=lp64 -mno-relax
# If Picolibc is available then select it explicitly. Ubuntu 24.04 ships its
# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
# is "nosys" so a value must be provided. To avoid having per-distro
# workarounds, always select Picolibc if available.
PICOLIBC_SPECS := $(shell $(CROSS)gcc --print-file-name=picolibc.specs)
PICOLIBC_SPECS := $(shell $(CROSS)$(CC) --print-file-name=picolibc.specs)
ifneq ($(PICOLIBC_SPECS),picolibc.specs)
CFLAGS_ARCH += -specs=$(PICOLIBC_SPECS)
USE_PICOLIBC := 1
Expand All @@ -143,7 +148,11 @@ else
$(error architecture '$(ARCH)' not supported)
endif

ifneq ($(findstring -musl,$(shell $(CROSS)gcc -dumpmachine)),)
ifeq ($(findstring clang,$(shell $(CC) --version)),clang)
CROSS =
endif

ifneq ($(findstring -musl,$(shell $(CROSS)$(CC) -dumpmachine)),)
USE_MUSL := 1
endif

Expand Down Expand Up @@ -175,8 +184,8 @@ LIBM_NAME := libc.a
else
LIBM_NAME := libm.a
endif
LIBGCC_PATH := $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-libgcc-file-name))
LIBM_PATH := $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-file-name=$(LIBM_NAME)))
LIBGCC_PATH := $(realpath $(shell $(CROSS)$(CC) $(CFLAGS) --print-libgcc-file-name))
LIBM_PATH := $(realpath $(shell $(CROSS)$(CC) $(CFLAGS) --print-file-name=$(LIBM_NAME)))
ifeq ($(USE_PICOLIBC),1)
ifeq ($(LIBM_PATH),)
# The CROSS toolchain prefix usually ends with a dash, but that may not be
Expand Down Expand Up @@ -224,12 +233,12 @@ $(CONFIG_H): $(SRC)
# Build .o from .c source files
$(BUILD)/%.o: %.c $(CONFIG_H) Makefile
$(ECHO) "CC $<"
$(Q)$(CROSS)gcc $(CFLAGS) -o $@ -c $<
$(Q)$(CROSS)$(CC) $(CFLAGS) -o $@ -c $<

# Build .o from .S source files
$(BUILD)/%.o: %.S $(CONFIG_H) Makefile
$(ECHO) "AS $<"
$(Q)$(CROSS)gcc $(CFLAGS) -o $@ -c $<
$(Q)$(CROSS)$(CC) $(CFLAGS) -o $@ -c $<

# Build .mpy from .py source files
$(BUILD)/%.mpy: %.py
Expand Down
4 changes: 4 additions & 0 deletions py/mpconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,18 @@
#endif

#if MP_INT_TYPE == MP_INT_TYPE_INTPTR
#if !defined(MP_INT_TYPES_DEFINED)
typedef intptr_t mp_int_t;
typedef uintptr_t mp_uint_t;
#endif
#define MP_INT_MAX INTPTR_MAX
#define MP_INT_MIN INTPTR_MIN
#define MP_UINT_MAX INTPTR_UMAX
#elif MP_INT_TYPE == MP_INT_TYPE_INT64
#if !defined(MP_INT_TYPES_DEFINED)
typedef int64_t mp_int_t;
typedef uint64_t mp_uint_t;
#endif
#define MP_INT_MAX INT64_MAX
#define MP_INT_MIN INT64_MIN
#define MP_UINT_MAX INT64_UMAX
Expand Down
3 changes: 2 additions & 1 deletion tools/mpy_ld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,8 @@ def do_preprocess(args):
"#include <stdint.h>\n"
"typedef uintptr_t mp_uint_t;\n"
"typedef intptr_t mp_int_t;\n"
"typedef uintptr_t mp_off_t;",
"typedef uintptr_t mp_off_t;\n"
"#define MP_INT_TYPES_DEFINED",
file=f,
)
for i, q in enumerate(static_qstrs):
Expand Down
Loading