fix(target): add -Wl,--whole-archive linker option

Author: erhankur

CMakeLists.txt

@@ -50,19 +50,18 @@ include_directories(include/esp-stub-lib)
 add_compile_definitions(${STUB_COMPILE_DEFS})
 
 # Three-layer architecture:
-# - entry: Main stub code (src/)
-# - common: Generic implementations using base headers + target's soc.h  + (weak functions)
-# - target: Target-specific code + soc.h + overrides (weak functions)
-# - base: Interface headers (target/*.h, private/*.h) - serves to common and target
+#
+# Layer structure and locations:
+# - entry:  Main stub code                     → src/
+# - common: Generic implementations (weak)     → src/target/common/
+# - target: Target-specific overrides (strong) → src/target/${ESP_TARGET}/
+# - base:   Interface headers only             → src/target/base/
 #
 # Dependency flow: entry → common → target
 #                            ↓         ↓
 #                           base      base
 
-add_subdirectory(src/target/base ${ESP_BASE_LIB})
-add_subdirectory(src/target/${ESP_TARGET} ${ESP_TARGET_LIB})
-add_subdirectory(src/target/common ${ESP_COMMON_LIB})
+add_subdirectory(src/target)
 
-target_link_libraries(${ESP_TARGET_LIB} PUBLIC ${ESP_BASE_LIB})
-target_link_libraries(${ESP_COMMON_LIB} PUBLIC ${ESP_BASE_LIB} ${ESP_TARGET_LIB})
+# Link to common library (which transitively includes target and base)
 target_link_libraries(${ESP_STUB_LIB} PUBLIC ${ESP_COMMON_LIB})

src/target/CMakeLists.txt

@@ -0,0 +1,26 @@
+# Parent CMakeLists for all target directories
+# This file contains common setup for all targets
+
+# Build base (interface headers)
+add_subdirectory(base ${ESP_BASE_LIB})
+
+# Build target-specific library
+add_subdirectory(${ESP_TARGET} ${ESP_TARGET_LIB})
+
+# Build common library
+add_subdirectory(common ${ESP_COMMON_LIB})
+
+# Apply common configurations to target library
+# This ensures strong symbols override weak ones
+target_link_options(${ESP_TARGET_LIB}
+    PUBLIC -Wl,--whole-archive
+)
+
+# Set common include directories for target library
+target_include_directories(${ESP_TARGET_LIB}
+    PUBLIC ${CMAKE_CURRENT_LIST_DIR}/${ESP_TARGET}/include
+)
+
+# Setup dependency chain: target → base, common → base + target
+target_link_libraries(${ESP_TARGET_LIB} PUBLIC ${ESP_BASE_LIB})
+target_link_libraries(${ESP_COMMON_LIB} PUBLIC ${ESP_BASE_LIB} ${ESP_TARGET_LIB})

src/target/esp32/CMakeLists.txt

@@ -5,10 +5,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32.rom.libc-funcs.ld

src/target/esp32c2/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c2.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c2.rom.api.ld

src/target/esp32c3/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c3.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c3.rom.api.ld

src/target/esp32c5/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c5.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c5.rom.api.ld

src/target/esp32c6/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c6.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c6.rom.api.ld

src/target/esp32c61/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c61.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c61.rom.api.ld

src/target/esp32h2/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h2.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h2.rom.api.ld

src/target/esp32h21/CMakeLists.txt

@@ -4,10 +4,6 @@ set(srcs
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
-target_include_directories(${ESP_TARGET_LIB}
-    PUBLIC include
-)
-
 target_link_options(${ESP_TARGET_LIB}
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h21.rom.ld
     PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h21.rom.api.ld