Skip to content
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

[llvm] update to 19.1.7 #43625

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+49 −1,782
Draft

[llvm] update to 19.1.7 #43625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618d91f
[llvm] update to 19.1.7
rremilian Feb 4, 2025
c79a462
[llvm] remove patch 82407
rremilian Feb 4, 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
120 changes: 39 additions & 81 deletions ports/llvm/0002-fix-tools-install-dir.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
bolt/cmake/modules/AddBOLT.cmake | 2 +-
clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +-
clang-tools-extra/modularize/CMakeLists.txt | 2 +-
clang/cmake/modules/AddClang.cmake | 2 +-
clang/tools/c-index-test/CMakeLists.txt | 2 +-
clang/tools/clang-format/CMakeLists.txt | 2 +-
clang/tools/scan-build-py/CMakeLists.txt | 4 ++--
clang/tools/scan-build/CMakeLists.txt | 2 +-
clang/tools/scan-view/CMakeLists.txt | 2 +-
flang/cmake/modules/AddFlang.cmake | 2 +-
flang/tools/f18/CMakeLists.txt | 2 +-
flang/tools/flang-driver/CMakeLists.txt | 2 +-
lld/cmake/modules/AddLLD.cmake | 2 +-
lldb/cmake/modules/AddLLDB.cmake | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake
index 1f69b9046320..b0de5186dde4 100644
index c7ac662c6..f5a7e7c01 100644
--- a/bolt/cmake/modules/AddBOLT.cmake
+++ b/bolt/cmake/modules/AddBOLT.cmake
@@ -17,7 +17,7 @@ macro(add_bolt_tool name)
@@ -16,7 +16,7 @@ macro(add_bolt_tool name)
get_target_export_arg(${name} BOLT export_to_bolttargets)
install(TARGETS ${name}
${export_to_bolttargets}
Expand All @@ -28,7 +12,7 @@ index 1f69b9046320..b0de5186dde4 100644

if(NOT LLVM_ENABLE_IDE)
diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
index b220cbea80f1..b94501ec82ab 100644
index b220cbea8..b94501ec8 100644
--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
@@ -65,6 +65,6 @@ install(PROGRAMS clang-tidy-diff.py
Expand All @@ -40,7 +24,7 @@ index b220cbea80f1..b94501ec82ab 100644
COMPONENT clang-tidy
RENAME run-clang-tidy)
diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
index eb5383c3ad44..39a34dfe8c71 100644
index eb5383c3a..39a34dfe8 100644
--- a/clang-tools-extra/modularize/CMakeLists.txt
+++ b/clang-tools-extra/modularize/CMakeLists.txt
@@ -27,5 +27,5 @@ clang_target_link_libraries(modularize
Expand All @@ -51,20 +35,20 @@ index eb5383c3ad44..39a34dfe8c71 100644
+ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
COMPONENT clang-extras)
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index 75b0080f6715..46e32ddbe0cd 100644
index 9d09be193..73a238d32 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -169,7 +169,7 @@ macro(add_clang_tool name)
get_target_export_arg(${name} Clang export_to_clangtargets)
install(TARGETS ${name}
${export_to_clangtargets}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
COMPONENT ${name})
@@ -124,7 +124,7 @@ macro(add_clang_library name)
${export_to_clangtargets}
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}")

if(NOT LLVM_ENABLE_IDE)
if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-${lib}
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
index 0ae1b4e55244..7774cd27afcd 100644
index 0ae1b4e55..7774cd27a 100644
--- a/clang/tools/c-index-test/CMakeLists.txt
+++ b/clang/tools/c-index-test/CMakeLists.txt
@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
Expand All @@ -77,7 +61,7 @@ index 0ae1b4e55244..7774cd27afcd 100644

install(TARGETS c-index-test
diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
index 1c61a3c8fb80..4220d90274bd 100644
index 1c61a3c8f..4220d9027 100644
--- a/clang/tools/clang-format/CMakeLists.txt
+++ b/clang/tools/clang-format/CMakeLists.txt
@@ -36,7 +36,7 @@ install(FILES clang-format.py
Expand All @@ -90,7 +74,7 @@ index 1c61a3c8fb80..4220d90274bd 100644

if (WIN32 AND NOT CYGWIN)
diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
index 3aca22c0b0a8..a8283219c99f 100644
index 9273eb5ed..f9abcb2ca 100644
--- a/clang/tools/scan-build-py/CMakeLists.txt
+++ b/clang/tools/scan-build-py/CMakeLists.txt
@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles})
Expand All @@ -112,7 +96,7 @@ index 3aca22c0b0a8..a8283219c99f 100644
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
endif()
diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
index ef687b0e90a1..47f31efc9174 100644
index ef687b0e9..47f31efc9 100644
--- a/clang/tools/scan-build/CMakeLists.txt
+++ b/clang/tools/scan-build/CMakeLists.txt
@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
Expand All @@ -124,73 +108,47 @@ index ef687b0e90a1..47f31efc9174 100644
COMPONENT scan-build)
endforeach()

diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
index 07aec76ee66f..55a945bb278d 100644
--- a/clang/tools/scan-view/CMakeLists.txt
+++ b/clang/tools/scan-view/CMakeLists.txt
@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
install(PROGRAMS bin/${BinFile}
- DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
COMPONENT scan-view)
endforeach()

diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
index 41ce8738e7bf..d9659c4cf53a 100644
index 9ed1a3050..8c56414bd 100644
--- a/flang/cmake/modules/AddFlang.cmake
+++ b/flang/cmake/modules/AddFlang.cmake
@@ -115,7 +115,7 @@ macro(add_flang_tool name)
get_target_export_arg(${name} Flang export_to_flangtargets)
install(TARGETS ${name}
${export_to_flangtargets}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}"
COMPONENT ${name})

if(NOT LLVM_ENABLE_IDE)
diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
index ba6c6642c0b6..ab2802aeeaaa 100644
--- a/flang/tools/f18/CMakeLists.txt
+++ b/flang/tools/f18/CMakeLists.txt
@@ -83,7 +83,7 @@ if (NOT WIN32)
@ONLY
)
add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc)
- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")
endif()
@@ -77,7 +77,7 @@ function(add_flang_library name)
${export_to_flangtargets}
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")

# TODO Move this to a more suitable location
if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-${name}
diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
index 3ce8b407450d..6b2e2b0dc33a 100644
index 9f33cdfe3..908b874c6 100644
--- a/flang/tools/flang-driver/CMakeLists.txt
+++ b/flang/tools/flang-driver/CMakeLists.txt
@@ -43,4 +43,4 @@ if(FLANG_PLUGIN_SUPPORT)
@@ -35,4 +35,4 @@ if(FLANG_PLUGIN_SUPPORT)
export_executable_symbols_for_plugins(flang-new)
endif()

-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS flang-new DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")
diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
index 2ee066b41535..c6a4740ab9eb 100644
index 9f2684b6f..dfb55d99a 100644
--- a/lld/cmake/modules/AddLLD.cmake
+++ b/lld/cmake/modules/AddLLD.cmake
@@ -56,7 +56,7 @@ macro(add_lld_tool name)
get_target_export_arg(${name} LLD export_to_lldtargets)
install(TARGETS ${name}
${export_to_lldtargets}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}"
COMPONENT ${name})
@@ -19,7 +19,7 @@ macro(add_lld_library name)
${export_to_lldtargets}
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}")

if(NOT CMAKE_CONFIGURATION_TYPES)
if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
add_llvm_install_targets(install-${name}
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index 328e883ddbe5..86eebba45e01 100644
index 538029037..97b566b7d 100644
--- a/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -221,7 +221,7 @@ function(add_lldb_executable name)
@@ -219,7 +219,7 @@ function(add_lldb_executable name)
endif()

if(ARG_GENERATE_INSTALL)
Expand Down
Loading
Loading