g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to deal with GCC 13+ and rv32 arch extensions. (#23086)

master
Nick Brassel 2024-03-09 21:40:19 +11:00 committed by GitHub
parent fec2323089
commit 900e79febe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platforms/chibios/platform.mk
View File

@ -402,6 +402,17 @@ ifeq ($(strip $(MCU)), risc-v)
-mabi=$(MCU_ABI) \ -mabi=$(MCU_ABI) \
-mcmodel=$(MCU_CMODEL) \ -mcmodel=$(MCU_CMODEL) \
-mstrict-align -mstrict-align
# Deal with different arch revisions and gcc renaming them
ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
MCUFLAGS = -march=$(MCU_ARCH)_zicsr \
-mabi=$(MCU_ABI) \
-mcmodel=$(MCU_CMODEL) \
-mstrict-align
ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
$(call CATASTROPHIC_ERROR,Incompatible toolchain,No compatible RISC-V toolchain found. Can't work out correct architecture.)
endif
endif
else else
# ARM toolchain specific configuration # ARM toolchain specific configuration
TOOLCHAIN ?= arm-none-eabi- TOOLCHAIN ?= arm-none-eabi-