From acc51de68eab3bc3819b303fcd330d246de87b6c Mon Sep 17 00:00:00 2001 From: Davide Mor <davide.mor@skywarder.eu> Date: Thu, 15 Dec 2022 12:30:39 +0100 Subject: [PATCH] [miosix-gcc] Added miosix lib support --- etc/config/c++.defaults.properties | 20 +++++++++++++++----- etc/config/c.defaults.properties | 12 ++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/etc/config/c++.defaults.properties b/etc/config/c++.defaults.properties index ed8e93465..aa4e541e4 100644 --- a/etc/config/c++.defaults.properties +++ b/etc/config/c++.defaults.properties @@ -17,14 +17,24 @@ group.gcc-miosix.compilers=gmiosix-m4 group.gcc-miosix.groupName=Miosix gcc group.gcc-miosix.supportsExecute=false group.gcc-miosix.instructionSet=arm32 -group.gcc-miosix.demangler=/bin/arm-miosix-eabi-c++filt -group.gcc-miosix.objdumper=/bin/arm-miosix-eabi-objdump +group.gcc-miosix.demangler=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-c++filt +group.gcc-miosix.objdumper=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-objdump +group.gcc-miosix.exe=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-g++ -compiler.gmiosix-m4.exe=/bin/arm-miosix-eabi-g++ -compiler.gmiosix-m4.options=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 +compiler.gmiosix-m4.options=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -nostdlib compiler.gmiosix-m4.name=g++ (miosix, cortex-m4) +compiler.gmiosix-m4.supportedLibraries=miosix ################################# ################################# # Installed libs (See c++.amazon.properties for a scheme of libs group) -libs= +libs=miosix + +libs.miosix.name=Miosix +libs.miosix.versions=2_22 + +libs.miosix.versions.2_22.version=2.22 (stm32f429zi_stm32f4discovery 2m+6m xram) +libs.miosix.versions.2_22.staticliblink=miosix-stm32f429zi_stm32f4discovery:stdc++:c:m:gcc:atomic +libs.miosix.versions.2_22.libpath=/opt/arm-miosix-eabi/kernel/build/miosix/ +libs.miosix.versions.2_22.path=/opt/arm-miosix-eabi/kernel/miosix:/opt/arm-miosix-eabi/kernel/miosix/arch/common:/opt/arm-miosix-eabi/kernel/miosix/arch/cortexM4_stm32f4/common:/opt/arm-miosix-eabi/kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_stm32f4discovery:/opt/arm-miosix-eabi/kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_stm32f4discovery +libs.miosix.versions.2_22.options= -D_ARCH_CORTEXM4_STM32F4 -D_BOARD_STM32F429ZI_STM32F4DISCOVERY -D__ENABLE_XRAM -DHSE_VALUE=8000000 -DSYSCLK_FREQ_168MHz=168000000 -Wl,-T/opt/arm-miosix-eabi/kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_stm32f4discovery/stm32_2m+6m_xram.ld /opt/arm-miosix-eabi/kernel/build/miosix/CMakeFiles/stage_1_boot-stm32f429zi_stm32f4discovery.dir/arch/cortexM4_stm32f4/stm32f429zi_stm32f4discovery/core/stage_1_boot.cpp.o \ No newline at end of file diff --git a/etc/config/c.defaults.properties b/etc/config/c.defaults.properties index 56b5e8e23..b977fb18d 100644 --- a/etc/config/c.defaults.properties +++ b/etc/config/c.defaults.properties @@ -13,16 +13,16 @@ group.gcc.compilers=cg compiler.cg.exe=/bin/gcc compiler.cg.name=gcc -group.gcc-miosix.compilers=cgmiosix-m4 +group.gcc-miosix.compilers=gmiosix-m4 group.gcc-miosix.groupName=Miosix gcc group.gcc-miosix.supportsExecute=false group.gcc-miosix.instructionSet=arm32 -group.gcc-miosix.demangler=/bin/arm-miosix-eabi-c++filt -group.gcc-miosix.objdumper=/bin/arm-miosix-eabi-objdump +group.gcc-miosix.demangler=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-c++filt +group.gcc-miosix.objdumper=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-objdump +group.gcc-miosix.exe=/opt/arm-miosix-eabi/bin/arm-miosix-eabi-gcc -compiler.cgmiosix-m4.exe=/bin/arm-miosix-eabi-gcc -compiler.cgmiosix-m4.options=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -compiler.cgmiosix-m4.name=gcc (miosix, cortex-m4) +compiler.gmiosix-m4.options=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -nostdlib +compiler.gmiosix-m4.name=gcc (miosix, cortex-m4) ################################# ################################# -- GitLab