-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CI: Use Mac OS 11 and XCode 13 * LLVM 13.0.0
- Loading branch information
Showing
17 changed files
with
876 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt | ||
| index 561665d58cad..3c73878a4483 100644 | ||
| --- a/clang/cmake/modules/CMakeLists.txt | ||
| +++ b/clang/cmake/modules/CMakeLists.txt | ||
| @@ -3,11 +3,11 @@ include(LLVMDistributionSupport) | ||
| # Generate a list of CMake library targets so that other CMake projects can | ||
| # link against them. LLVM calls its version of this file LLVMExports.cmake, but | ||
| # the usual CMake convention seems to be ${Project}Targets.cmake. | ||
| -set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang) | ||
| +set(CLANG_INSTALL_PACKAGE_DIR share/clang) | ||
| set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| # Keep this in sync with llvm/cmake/CMakeLists.txt! | ||
| -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) | ||
| diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt | ||
| index e46498a6bc35..2e922f8ca89d 100644 | ||
| --- a/flang/cmake/modules/CMakeLists.txt | ||
| +++ b/flang/cmake/modules/CMakeLists.txt | ||
| @@ -1,11 +1,11 @@ | ||
| # Generate a list of CMake library targets so that other CMake projects can | ||
| # link against them. LLVM calls its version of this file LLVMExports.cmake, but | ||
| # the usual CMake convention seems to be ${Project}Targets.cmake. | ||
| -set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang) | ||
| +set(FLANG_INSTALL_PACKAGE_DIR share/flang) | ||
| set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| # Keep this in sync with llvm/cmake/CMakeLists.txt! | ||
| -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) | ||
| diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt | ||
| index 62d03fa901dd..09b0f54ee8c3 100644 | ||
| --- a/lld/cmake/modules/CMakeLists.txt | ||
| +++ b/lld/cmake/modules/CMakeLists.txt | ||
| @@ -1,11 +1,11 @@ | ||
| # Generate a list of CMake library targets so that other CMake projects can | ||
| # link against them. LLVM calls its version of this file LLVMExports.cmake, but | ||
| # the usual CMake convention seems to be ${Project}Targets.cmake. | ||
| -set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld) | ||
| +set(LLD_INSTALL_PACKAGE_DIR share/lld) | ||
| set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| # Keep this in sync with llvm/cmake/CMakeLists.txt! | ||
| -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) | ||
| diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake | ||
| index 29e40f45fef8..e9094e9b8eb2 100644 | ||
| --- a/llvm/cmake/modules/AddLLVM.cmake | ||
| +++ b/llvm/cmake/modules/AddLLVM.cmake | ||
| @@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins) | ||
|
|
||
| ## Part 1: Extension header to be included whenever we need extension | ||
| # processing. | ||
| - set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| + set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
| file(WRITE | ||
| "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" | ||
| diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt | ||
| index 51b6a4fdc284..a818de2e116c 100644 | ||
| --- a/llvm/cmake/modules/CMakeLists.txt | ||
| +++ b/llvm/cmake/modules/CMakeLists.txt | ||
| @@ -1,6 +1,6 @@ | ||
| include(LLVMDistributionSupport) | ||
|
|
||
| -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| # First for users who use an installed LLVM, create the LLVMExports.cmake file. | ||
| diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt | ||
| index 65efc4a14987..7c3213ab0c2b 100644 | ||
| --- a/mlir/cmake/modules/CMakeLists.txt | ||
| +++ b/mlir/cmake/modules/CMakeLists.txt | ||
| @@ -3,11 +3,11 @@ include(LLVMDistributionSupport) | ||
| # Generate a list of CMake library targets so that other CMake projects can | ||
| # link against them. LLVM calls its version of this file LLVMExports.cmake, but | ||
| # the usual CMake convention seems to be ${Project}Targets.cmake. | ||
| -set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir) | ||
| +set(MLIR_INSTALL_PACKAGE_DIR share/mlir) | ||
| set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| # Keep this in sync with llvm/cmake/CMakeLists.txt! | ||
| -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") | ||
|
|
||
| get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) | ||
| diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt | ||
| index 7cc129ba2e90..9776391cd535 100644 | ||
| --- a/polly/cmake/CMakeLists.txt | ||
| +++ b/polly/cmake/CMakeLists.txt | ||
| @@ -1,7 +1,7 @@ | ||
| # Keep this in sync with llvm/cmake/CMakeLists.txt! | ||
|
|
||
| -set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") | ||
| -set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") | ||
| +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) | ||
| +set(POLLY_INSTALL_PACKAGE_DIR share/polly) | ||
| if (CMAKE_CONFIGURATION_TYPES) | ||
| set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake") | ||
| else() | ||
| diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt | ||
| index 8bea8843589b..3658c0a4414a 100644 | ||
| --- a/pstl/CMakeLists.txt | ||
| +++ b/pstl/CMakeLists.txt | ||
| @@ -81,10 +81,10 @@ install(TARGETS ParallelSTL | ||
| install(EXPORT ParallelSTLTargets | ||
| FILE ParallelSTLTargets.cmake | ||
| NAMESPACE pstl:: | ||
| - DESTINATION lib/cmake/ParallelSTL) | ||
| + DESTINATION share/ParallelSTL) | ||
| install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" | ||
| "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" | ||
| - DESTINATION lib/cmake/ParallelSTL) | ||
| + DESTINATION share/ParallelSTL) | ||
| install(DIRECTORY include/ | ||
| DESTINATION include | ||
| PATTERN "*.in" EXCLUDE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt | ||
| index bdb867e352f7..16a13fa959ea 100644 | ||
| --- a/openmp/runtime/src/CMakeLists.txt | ||
| +++ b/openmp/runtime/src/CMakeLists.txt | ||
| @@ -159,7 +159,7 @@ else() | ||
| endif() | ||
|
|
||
| set_target_properties(omp PROPERTIES | ||
| - PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" | ||
| + PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" DEBUG_POSTFIX "" | ||
| LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" | ||
| LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} | ||
| ) | ||
| @@ -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 | ||
| - PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" | ||
| + PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" DEBUG_POSTFIX "" | ||
| LINKER_LANGUAGE C | ||
| ) | ||
| add_dependencies(ompimp omp) # ensure generated import library is created first |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h | ||
| index 7b7d5d991f3f..332864c1907e 100644 | ||
| --- a/llvm/include/llvm/Support/type_traits.h | ||
| +++ b/llvm/include/llvm/Support/type_traits.h | ||
| @@ -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 | ||
| +#if 0 | ||
| static_assert(value == std::is_trivially_copyable<T>::value, | ||
| "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp | ||
| index 1a2f04552d13..9370c5e28206 100644 | ||
| --- a/llvm/tools/llvm-config/llvm-config.cpp | ||
| +++ b/llvm/tools/llvm-config/llvm-config.cpp | ||
| @@ -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). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt | ||
| index 8131f6005dc2..9afef2e5a4e7 100644 | ||
| --- a/clang/lib/Headers/CMakeLists.txt | ||
| +++ b/clang/lib/Headers/CMakeLists.txt | ||
| @@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES | ||
| FOLDER "Misc" | ||
| RUNTIME_OUTPUT_DIRECTORY "${output_dir}") | ||
|
|
||
| -set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) | ||
| +set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) | ||
|
|
||
| install( | ||
| FILES ${files} ${generated_files} | ||
| diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt | ||
| 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: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 c11342e68813..61bb52135c43 100644 | ||
| --- a/compiler-rt/cmake/base-config-ix.cmake | ||
| +++ b/compiler-rt/cmake/base-config-ix.cmake | ||
| @@ -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}) | ||
| - set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) | ||
| + set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION}) | ||
| option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." | ||
| ${LLVM_INCLUDE_TESTS}) | ||
| option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" |
Oops, something went wrong.