Skip to content

Commit 9c4366f

Browse files
Jordan Yatescarlescufi
authored andcommitted
cmake: remove LINKER_PASS2 define
This option was deprecated for the v2.6 release, and has therefore met the 2 release deprecation cycle requirements. Signed-off-by: Jordan Yates <[email protected]>
1 parent 7468121 commit 9c4366f

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff 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

cmake/linker/armlink/target.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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)

cmake/linker/ld/target.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)