File tree Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1296,12 +1296,9 @@ else()
12961296 # The final linker pass uses the same source linker script of the
12971297 # previous passes, but this time with a different output
12981298 # file and preprocessed with the define LINKER_ZEPHYR_FINAL.
1299- #
1300- # LINKER_PASS2 is deprecated but being kept to avoid breaking
1301- # external projects. It will be removed in the future.
13021299 configure_linker_script(
13031300 linker.cmd
1304- "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2 "
1301+ "-DLINKER_ZEPHYR_FINAL"
13051302 ${CODE_RELOCATION_DEP}
13061303 ${ZEPHYR_PREBUILT_EXECUTABLE}
13071304 zephyr_generated_headers
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
3333
3434 if ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_PREBUILT" )
3535 set (PASS 1)
36- elseif ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2 " )
36+ elseif ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_FINAL" )
3737 set (PASS 2)
3838 set (STEERING_FILE ${CMAKE_CURRENT_BINARY_DIR} /armlink_symbol_steering.steer)
3939 set (STEERING_C ${CMAKE_CURRENT_BINARY_DIR} /armlink_symbol_steering.c)
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
3434 if (CONFIG_CMAKE_LINKER_GENERATOR)
3535 if ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_PREBUILT" )
3636 set (PASS 1)
37- elseif ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2 " )
37+ elseif ("${linker_pass_define} " STREQUAL "-DLINKER_ZEPHYR_FINAL" )
3838 set (PASS 2)
3939 endif ()
4040
You can’t perform that action at this time.
0 commit comments