Remove -ffreestanding link and compile flags, and have main return int

4ms · Jan 10, 2025 · 48069b9 · 48069b9
1 parent 782604e
commit 48069b9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/firmware/cmake/arch_mp15xa7.cmake b/firmware/cmake/arch_mp15xa7.cmake
@@ -39,7 +39,6 @@ add_compile_options(
   -fdata-sections
   -ffunction-sections
   -nostartfiles
-  -ffreestanding
   -fno-unwind-tables
   -Wall
   -Werror=return-type

diff --git a/firmware/cmake/arch_mp15xm4.cmake b/firmware/cmake/arch_mp15xm4.cmake
@@ -34,7 +34,6 @@ add_compile_options(
   -fdata-sections
   -ffunction-sections
   -nostartfiles
-  -ffreestanding
   -fno-unwind-tables
   -Wall
   -Werror=return-type
@@ -50,8 +49,7 @@ add_compile_options(
 
 add_link_options(
     -Wl,--gc-sections
-    -ffreestanding
     -nostartfiles
     ${MCU_FLAGS}
 )
-endmacro()
+endmacro()
diff --git a/firmware/src/CMakeLists.txt b/firmware/src/CMakeLists.txt
@@ -268,7 +268,6 @@ target_link_script(
   -L${FWDIR}
   -Wl,--gc-sections
   -Wno-psabi
-  -ffreestanding
   -nostartfiles
 )
 
diff --git a/firmware/src/core_a7/main.cc b/firmware/src/core_a7/main.cc
@@ -41,7 +41,7 @@ struct SystemInit : AppStartup, UartLog, Debug, Hardware {
 
 } // namespace MetaModule
 
-void main() {
+int main() {
 	using namespace MetaModule;
 
 	StaticBuffers::init();

diff --git a/firmware/src/core_m4/main_m4.cc b/firmware/src/core_m4/main_m4.cc
@@ -39,7 +39,7 @@ static void app_startup() {
 
 } // namespace MetaModule
 
-void main() {
+int main() {
 	using namespace MetaModule;
 	using namespace mdrivlib;