From 17b4aa24668bc4b223dd0613a48d2cc050e39358 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 27 Jun 2018 16:09:12 +0200 Subject: [PATCH] Remove -nostartfiles linker option from bootloader (#5996) * Remove -nostartfiles linker option from bootloader Compiling with this option creates undefined references to _fini * Remove now empty init.c --- .../src/targets/common/arm/stm32/bootloader/CMakeLists.txt | 3 +-- radio/src/targets/common/arm/stm32/bootloader/boot.cpp | 6 +----- radio/src/targets/common/arm/stm32/bootloader/init.c | 4 ---- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 radio/src/targets/common/arm/stm32/bootloader/init.c diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt index c88ac1bb6..b1bc92ad8 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt @@ -73,7 +73,6 @@ set(BOOTLOADER_SRC ../usb_bsp.c ../usb_driver.cpp ../flash_driver.cpp - init.c boot.cpp bin_files.cpp ) @@ -112,7 +111,7 @@ remove_definitions(-DCLI) remove_definitions(-DUSB_SERIAL) add_definitions(-DBOOT) -set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") +set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") add_executable(bootloader ${BOOTLOADER_SRC}) add_dependencies(bootloader ${BITMAPS_TARGET} firmware_translations) diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index 48e42f342..89e494ac0 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -526,8 +526,4 @@ int main() } return 0; -} - -#if defined(PCBHORUS) -void *__dso_handle = 0; -#endif +} \ No newline at end of file diff --git a/radio/src/targets/common/arm/stm32/bootloader/init.c b/radio/src/targets/common/arm/stm32/bootloader/init.c deleted file mode 100644 index 5a441f4bc..000000000 --- a/radio/src/targets/common/arm/stm32/bootloader/init.c +++ /dev/null @@ -1,4 +0,0 @@ -void _init (void) -{ - -}