Skip to content

Reapply "[Fuchsia][cmake] Allow using FatLTO when building runtimes" (#119252) #121820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 27, 2025
Merged

Reapply "[Fuchsia][cmake] Allow using FatLTO when building runtimes" (#119252) #121820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2035ab4
[𝘀𝗽𝗿] changes to main this commit is based on
ilovepi Jan 6, 2025
3a1622e
[𝘀𝗽𝗿] initial version
ilovepi Jan 6, 2025
2987f08
[𝘀𝗽𝗿] changes introduced through rebase
ilovepi Jan 7, 2025
3af6209
Rebase
ilovepi Jan 7, 2025
05bdf84
[𝘀𝗽𝗿] changes introduced through rebase
ilovepi Jan 10, 2025
434202a
Rebase
ilovepi Jan 10, 2025
445eaf2
[𝘀𝗽𝗿] changes introduced through rebase
ilovepi Jan 10, 2025
21783d8
Rebase on main
ilovepi Jan 10, 2025
ec83685
[𝘀𝗽𝗿] changes introduced through rebase
ilovepi Jan 10, 2025
ed1ce0f
Rebase
ilovepi Jan 10, 2025
dfe7d7b
[𝘀𝗽𝗿] changes introduced through rebase
ilovepi Jan 14, 2025
a8d8e9b
Rebase on main
ilovepi Jan 14, 2025
b5f3622
Rebase and update commit message
ilovepi Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions clang/cmake/caches/Fuchsia-stage2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ foreach(target aarch64-unknown-linux-gnu;armv7-unknown-linux-gnueabihf;i386-unkn
set(RUNTIMES_${target}_LLVM_TOOLS_DIR "${CMAKE_BINARY_DIR}/bin" CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")

# Enable FatLTO for Linux and baremetal runtimes
set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")

# Use .build-id link.
list(APPEND RUNTIME_BUILD_ID_LINK "${target}")
endif()
Expand Down Expand Up @@ -272,6 +276,10 @@ if(FUCHSIA_SDK)
set(RUNTIMES_${target}+asan+noexcept_LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
set(RUNTIMES_${target}+asan+noexcept_LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")

# Enable FatLTO for Fuchsia runtimes
set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")

# Use .build-id link.
list(APPEND RUNTIME_BUILD_ID_LINK "${target}")
endforeach()
Expand Down Expand Up @@ -369,6 +377,10 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
set(RUNTIMES_${target}_LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_ASSERTIONS OFF CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "libc;libcxx" CACHE STRING "")

# Enable FatLTO for baremetal runtimes
set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")
endforeach()

foreach(target riscv32-unknown-elf)
Expand Down Expand Up @@ -420,6 +432,10 @@ foreach(target riscv32-unknown-elf)
set(RUNTIMES_${target}_LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_ASSERTIONS OFF CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "libc;libcxx" CACHE STRING "")

# Enable FatLTO for baremetal runtimes
set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")
endforeach()

set(LLVM_BUILTIN_TARGETS "${BUILTIN_TARGETS}" CACHE STRING "")
Expand Down
2 changes: 1 addition & 1 deletion llvm/cmake/modules/HandleLLVMOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ elseif(LLVM_ENABLE_LTO)
endif()
endif()

if(LLVM_ENABLE_FATLTO AND UNIX AND NOT APPLE)
if(LLVM_ENABLE_FATLTO AND ((UNIX AND NOT APPLE) OR FUCHSIA))
append("-ffat-lto-objects" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
if(NOT LINKER_IS_LLD_LINK)
append("-ffat-lto-objects" CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS)
Expand Down
Loading