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.

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 13.0.0 #20749

Merged
merged 48 commits into from
Dec 20, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3a909d2
[llvm] update to 13.0.0
yurybura Oct 14, 2021
2869482
add version
yurybura Oct 14, 2021
200e7e2
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Oct 14, 2021
41239d6
[llvm] rework processing of the CMake packages
yurybura Oct 15, 2021
17a68eb
update versions
yurybura Oct 15, 2021
c6019a3
[llvm] return patch to fix config paths
yurybura Oct 16, 2021
7dc7cc9
update version
yurybura Oct 16, 2021
9fed874
[llvm] allow to build Flang on Windows
yurybura Oct 27, 2021
26467e9
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Oct 27, 2021
0dfc89d
add version
yurybura Oct 27, 2021
da04d05
[llvm] temporary enable Flang by default for test
yurybura Oct 30, 2021
31315d8
update version
yurybura Oct 30, 2021
cc613a0
[llvm] fix Flang installation
yurybura Oct 31, 2021
7b9f738
update version
yurybura Oct 31, 2021
8455935
[llvm] try to fix Flang build
yurybura Oct 31, 2021
5a885b2
update version
yurybura Oct 31, 2021
d34cc24
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Nov 3, 2021
bc4724e
[llvm] remove Flang from defaults and use Perl path
yurybura Nov 3, 2021
3f2e274
[halide] update to 13.0.0
yurybura Nov 3, 2021
eea6fde
update versions
yurybura Nov 3, 2021
4b17464
[mesa] update to v21.2.5 and fix build with LLVM 13
yurybura Nov 8, 2021
b7ba4ae
[llvm] use version
yurybura Nov 8, 2021
a206190
update versions
yurybura Nov 8, 2021
18bdf47
[opencv4] fix build with Halide 13
yurybura Nov 8, 2021
55f9db3
update version
yurybura Nov 8, 2021
e7a8ce6
update ci.baseline
yurybura Nov 9, 2021
a0ef507
[halide] update usage file
yurybura Nov 9, 2021
ef6ba71
[llvm] update supports
yurybura Nov 9, 2021
0aaa1bb
update versions
yurybura Nov 9, 2021
1f56cc1
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Nov 21, 2021
fcfa3ca
[vcpkg-ci-llvm] add test port
yurybura Nov 21, 2021
9a77063
[vcpkg-ci-llvm] rework test port
yurybura Nov 21, 2021
9667353
[vcpkg-ci-llvm] test more features
yurybura Nov 25, 2021
dec5609
[halide] update to v13.0.1
yurybura Nov 26, 2021
0a34548
update version
yurybura Nov 26, 2021
ee789fe
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Dec 6, 2021
753e863
[mesa] recover port version
yurybura Dec 6, 2021
34e076f
update versions
yurybura Dec 6, 2021
5a8e3ee
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Dec 10, 2021
65d53a7
[opencv4] update version
yurybura Dec 10, 2021
0ba9a37
update version
yurybura Dec 10, 2021
ba1e0cd
Update opencv4.json
yurybura Dec 10, 2021
83ac625
[halide] update to v13.0.2 and fix usage
yurybura Dec 10, 2021
e2b59af
update version
yurybura Dec 10, 2021
820a41a
Update ports/halide/portfile.cmake
yurybura Dec 17, 2021
0d0de73
update version
yurybura Dec 17, 2021
694a40e
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Dec 17, 2021
211005c
enable LLVM ABI breaking checks to avoid Halide build fail
yurybura Dec 18, 2021
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
136 changes: 0 additions & 136 deletions ports/llvm/0002-fix-install-paths.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/llvm/0003-fix-openmp-debug.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 822f9ca2b825..814e25864610 100644
index bdb867e352f7..16a13fa959ea 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -157,7 +157,7 @@ else()
@@ -159,7 +159,7 @@ else()
endif()

set_target_properties(omp PROPERTIES
Expand All @@ -14,7 +14,7 @@ index 822f9ca2b825..814e25864610 100644
LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}"
LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE}
)
@@ -232,7 +232,7 @@ if(WIN32)
@@ -236,7 +236,7 @@ if(WIN32)
# Create new import library that is just the previously created one + kmp_import.cpp
add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
set_target_properties(ompimp PROPERTIES
Expand Down
11 changes: 7 additions & 4 deletions ports/llvm/0004-fix-dr-1734.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
llvm/include/llvm/Support/type_traits.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h
index b7d48e8e1ad..53ba24efc00 100644
index 7b7d5d991f3f..469b681deea3 100644
--- a/llvm/include/llvm/Support/type_traits.h
+++ b/llvm/include/llvm/Support/type_traits.h
@@ -177,7 +177,8 @@ class is_trivially_copyable {
@@ -176,7 +176,8 @@ class is_trivially_copyable {
(has_deleted_copy_assign || has_trivial_copy_assign) &&
(has_deleted_copy_constructor || has_trivial_copy_constructor);

-#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE
+ // due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable
+// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable
+#if 0
static_assert(value == std::is_trivially_copyable<T>::value,
"inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable");
Expand Down
10 changes: 6 additions & 4 deletions ports/llvm/0005-fix-tools-path.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
llvm/tools/llvm-config/llvm-config.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
index 53ba24efc00..0badcafe000 100644
index 1a2f04552d13..9370c5e28206 100644
--- a/llvm/tools/llvm-config/llvm-config.cpp
+++ b/llvm/tools/llvm-config/llvm-config.cpp
@@ -304,8 +304,8 @@ int main(int argc, char **argv) {
// Create an absolute path, and pop up one directory (we expect to be inside a
@@ -305,7 +305,7 @@ int main(int argc, char **argv) {
// bin dir).
sys::fs::make_absolute(CurrentPath);
CurrentExecPrefix =
- sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
+ sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str();

// Check to see if we are inside a development tree by comparing to possible
// locations (prefix style or CMake style).
14 changes: 7 additions & 7 deletions ports/llvm/0007-fix-compiler-rt-install-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
index 0692fe75a441..65f72c2da7da 100644
index 8131f6005dc2..9afef2e5a4e7 100644
--- a/clang/lib/Headers/CMakeLists.txt
+++ b/clang/lib/Headers/CMakeLists.txt
@@ -208,7 +208,7 @@ set_target_properties(clang-resource-headers PROPERTIES
@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES
FOLDER "Misc"
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

Expand All @@ -17,23 +17,23 @@ index 0692fe75a441..65f72c2da7da 100644
install(
FILES ${files} ${generated_files}
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
index 61bbbf8faedd..f6d0b73d9913 100644
index 61b1c60bf590..c20a5a326f15 100644
--- a/clang/runtime/CMakeLists.txt
+++ b/clang/runtime/CMakeLists.txt
@@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
-DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
- -DCOMPILER_RT_INSTALL_PATH:STRING=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
+ -DCOMPILER_RT_INSTALL_PATH:STRING=tools/llvm/lib/clang/${CLANG_VERSION}
- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
+ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION}
-DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
index 964dd598f102..7379a1ba06d1 100644
index c11342e68813..61bb52135c43 100644
--- a/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@ -43,7 +43,7 @@ if (LLVM_TREE_AVAILABLE)
@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE)
# Setup the paths where compiler-rt runtimes and headers should be stored.
set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
Expand Down
18 changes: 0 additions & 18 deletions ports/llvm/0008-fix-libcxx-install.patch

This file was deleted.

37 changes: 19 additions & 18 deletions ports/llvm/0009-fix-tools-install-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ index 4caae81c49b6..8c459c51cc34 100644
+ RUNTIME DESTINATION tools/llvm
COMPONENT clang-extras)
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index 704278a0e93b..e8a87f574474 100644
index 5752f4277444..00b7d21b8fef 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -170,7 +170,7 @@ macro(add_clang_tool name)

@@ -159,7 +159,7 @@ macro(add_clang_tool name)
get_target_export_arg(${name} Clang export_to_clangtargets)
install(TARGETS ${name}
${export_to_clangtargets}
- RUNTIME DESTINATION bin
Expand Down Expand Up @@ -74,10 +74,10 @@ index ec0702d76f18..9a34a09921b1 100644
endforeach()

diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
index dd3d33439299..ded0b5530ad9 100644
index eccc6b83195b..232976c0c227 100644
--- a/clang/tools/scan-view/CMakeLists.txt
+++ b/clang/tools/scan-view/CMakeLists.txt
@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW)
@@ -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}
Expand All @@ -100,11 +100,11 @@ index 62f2de0cb15c..38dc821c76de 100644

add_custom_target(hmaptool ALL DEPENDS ${Depends})
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
index ba36a234babf..1197a8d8ff32 100644
index 5da58a59ed12..c019d7fc50a9 100644
--- a/flang/cmake/modules/AddFlang.cmake
+++ b/flang/cmake/modules/AddFlang.cmake
@@ -119,7 +119,7 @@ macro(add_flang_tool name)

@@ -108,7 +108,7 @@ macro(add_flang_tool name)
get_target_export_arg(${name} Flang export_to_flangtargets)
install(TARGETS ${name}
${export_to_flangtargets}
- RUNTIME DESTINATION bin
Expand All @@ -113,30 +113,31 @@ index ba36a234babf..1197a8d8ff32 100644

if(NOT LLVM_ENABLE_IDE)
diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
index 2e5350aecdc6..b4ab145846b5 100644
index 239859b5e5b9..12d00f904f8a 100644
--- a/flang/tools/f18/CMakeLists.txt
+++ b/flang/tools/f18/CMakeLists.txt
@@ -63,12 +63,12 @@ endforeach()
@@ -60,7 +60,7 @@ endforeach()

add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})

-install(TARGETS f18 DESTINATION bin)
+install(TARGETS f18 DESTINATION tools/llvm)

set(FLANG_DEFAULT_DRIVER "flang-new")
if (NOT FLANG_BUILD_NEW_DRIVER)
@@ -70,5 +70,5 @@ endif()
# This flang shell script will only work in a POSIX shell.
if (NOT WIN32)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
DESTINATION ${CMAKE_BINARY_DIR}/bin
FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.in ${CMAKE_BINARY_DIR}/bin/flang @ONLY)
- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm)
endif()
diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
index 23df41312403..86f4eafeed07 100644
index 9883475d1aa5..48e46586f387 100644
--- a/lld/cmake/modules/AddLLD.cmake
+++ b/lld/cmake/modules/AddLLD.cmake
@@ -54,7 +54,7 @@ macro(add_lld_tool name)

@@ -46,7 +46,7 @@ macro(add_lld_tool name)
get_target_export_arg(${name} LLD export_to_lldtargets)
install(TARGETS ${name}
${export_to_lldtargets}
- RUNTIME DESTINATION bin
Expand All @@ -145,7 +146,7 @@ index 23df41312403..86f4eafeed07 100644

if(NOT CMAKE_CONFIGURATION_TYPES)
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
index 5cff736ff57f..32f43bc1c9be 100644
index e77b2161a873..b325b934640c 100644
--- a/lld/tools/lld/CMakeLists.txt
+++ b/lld/tools/lld/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(lld
Expand All @@ -158,7 +159,7 @@ index 5cff736ff57f..32f43bc1c9be 100644
if(NOT LLD_SYMLINKS_TO_CREATE)
set(LLD_SYMLINKS_TO_CREATE
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index 4ed5c647c5d2..cb31901dddbb 100644
index 8be214a8509a..4a5d0fa39be3 100644
--- a/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -187,7 +187,7 @@ function(add_lldb_executable name)
Expand Down
4 changes: 2 additions & 2 deletions ports/llvm/0010-fix-libffi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 818fafbce148..66fc9f509ac7 100644
index dd0aaadb47c7..279435b5b27d 100644
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/cmake/config-ix.cmake
@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI )
@@ -343,7 +343,7 @@ if( LLVM_ENABLE_FFI )
message(FATAL_ERROR "libffi includes are not found.")
endif()

Expand Down
6 changes: 3 additions & 3 deletions ports/llvm/0011-fix-libxml2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
index ceef4b086..40b9e9955 100644
index ceef4b08637c..40b9e995597f 100644
--- a/clang/tools/c-index-test/CMakeLists.txt
+++ b/clang/tools/c-index-test/CMakeLists.txt
@@ -40,11 +40,7 @@ set_target_properties(c-index-test
Expand All @@ -20,10 +20,10 @@ index ceef4b086..40b9e9955 100644
endif()

diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
index 2fdf1502d..beeeeb9b1 100644
index b62cd7d24438..a8c78ee1bccd 100644
--- a/lldb/cmake/modules/LLDBConfig.cmake
+++ b/lldb/cmake/modules/LLDBConfig.cmake
@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA)
@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA)
endif()

if (LLDB_ENABLE_LIBXML2)
Expand Down
Loading