Skip to content

Commit e1f6479

Browse files
gerekonespressif-bot
gerekon
authored and
espressif-bot
committed
fix(build): Add missing '-nostartfiles' option in Clang toolchain files
1 parent 8d8d7de commit e1f6479

11 files changed

+14
-14
lines changed

‎tools/cmake/toolchain-clang-esp32.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=xtensa-esp32-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=xtensa-esp32-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32c2.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32c3.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32c5.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32c6.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32c61.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32h2.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32h4.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ set(CMAKE_AR llvm-ar)
1111
set(CMAKE_RANLIB llvm-ranlib)
1212
set(CMAKE_OBJDUMP riscv32-esp-elf-clang-objdump)
1313

14-
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imc_zicsr_zifencei -mabi=ilp32 \
14+
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imafc_zicsr_zifencei -mabi=ilp32 \
1515
${CMAKE_C_FLAGS}"
1616
UNIQ_CMAKE_C_FLAGS)
1717
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}"
1818
CACHE STRING "C Compiler Base Flags"
1919
FORCE)
2020

21-
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imc_zicsr_zifencei -mabi=ilp32 \
21+
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imafc_zicsr_zifencei -mabi=ilp32f \
2222
${CMAKE_CXX_FLAGS}"
2323
UNIQ_CMAKE_CXX_FLAGS)
2424
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}"
2525
CACHE STRING "C++ Compiler Base Flags"
2626
FORCE)
2727

28-
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imc_zicsr_zifencei -mabi=ilp32 \
28+
remove_duplicated_flags("--target=riscv32-esp-elf -march=rv32imafc_zicsr_zifencei -mabi=ilp32f \
2929
${CMAKE_ASM_FLAGS}"
3030
UNIQ_CMAKE_ASM_FLAGS)
3131
set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32p4.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=riscv32-esp-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

‎tools/cmake/toolchain-clang-esp32s2.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
3232
CACHE STRING "Assembler Base Flags"
3333
FORCE)
3434

35-
remove_duplicated_flags("--ld-path=xtensa-esp32s2-elf-clang-ld -z noexecstack \
35+
remove_duplicated_flags("-nostartfiles --ld-path=xtensa-esp32s2-elf-clang-ld -z noexecstack \
3636
${CMAKE_EXE_LINKER_FLAGS}"
3737
UNIQ_CMAKE_EXE_LINKER_FLAGS)
3838
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_EXE_LINKER_FLAGS}"

0 commit comments

Comments
 (0)