LLVM: Updates from upstream

ports/llvm-12/0001-fix-install-paths.patch → ports/llvm-12/0002-fix-install-paths.patch

@@ -63,10 +63,10 @@ index fa505a533762..90413be34120 100644
 
  get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS)
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 97c9980c7de3..52bb6aac73a6 100644
+index b74adc11ade9..0638aea2f8f6 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1015,7 +1015,7 @@ function(process_llvm_pass_plugins)
+@@ -974,7 +974,7 @@ function(process_llvm_pass_plugins)
 
        ## Part 1: Extension header to be included whenever we need extension
        #  processing.
@@ -76,7 +76,7 @@ index 97c9980c7de3..52bb6aac73a6 100644
        file(WRITE
            "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
 diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
-index 505dc9a29d70..612c3997107e 100644
+index 4b8879f65fe4..9e097ab223b5 100644
 --- a/llvm/cmake/modules/CMakeLists.txt
 +++ b/llvm/cmake/modules/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -104,7 +104,7 @@ index b9fb9adce2ea..85a54f699f30 100644
 
  get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS)
 diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt
-index 7cc129ba2e90..9776391cd535 100644
+index 211f95512717..2abe3803f910 100644
 --- a/polly/cmake/CMakeLists.txt
 +++ b/polly/cmake/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -118,7 +118,7 @@ index 7cc129ba2e90..9776391cd535 100644
    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
+index 8e6e1354707b..2ae7f7090025 100644
 --- a/pstl/CMakeLists.txt
 +++ b/pstl/CMakeLists.txt
 @@ -81,10 +81,10 @@ install(TARGETS ParallelSTL

ports/llvm-12/0002-fix-openmp-debug.patch → ports/llvm-12/0003-fix-openmp-debug.patch

@@ -1,3 +1,6 @@
+ openmp/runtime/src/CMakeLists.txt | 4 ++--
+ 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
 --- a/openmp/runtime/src/CMakeLists.txt

ports/llvm-12/0003-fix-dr-1734.patch → ports/llvm-12/0004-fix-dr-1734.patch

@@ -5,7 +5,7 @@ index b7d48e8e1ad..53ba24efc00 100644
 @@ -177,7 +177,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

ports/llvm-12/0004-fix-tools-path.patch → ports/llvm-12/0005-fix-tools-path.patch

@@ -9,6 +9,6 @@ index 53ba24efc00..0badcafe000 100644
    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).

ports/llvm-12/0005-fix-compiler-rt-install-path.patch → ports/llvm-12/0007-fix-compiler-rt-install-path.patch

@@ -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 b2c0ce8dd4a0..f36e1578198d 100644
+index 0692fe75a441..65f72c2da7da 100644
 --- a/clang/lib/Headers/CMakeLists.txt
 +++ b/clang/lib/Headers/CMakeLists.txt
-@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES
+@@ -208,7 +208,7 @@ set_target_properties(clang-resource-headers PROPERTIES
    FOLDER "Misc"
    RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
 
@@ -17,7 +17,7 @@ index b2c0ce8dd4a0..f36e1578198d 100644
  install(
    FILES ${files} ${generated_files}
 diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
-index 61bbbf8faedd..1d913da1170b 100644
+index 61bbbf8faedd..f6d0b73d9913 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}/)
@@ -30,10 +30,10 @@ index 61bbbf8faedd..1d913da1170b 100644
                 -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 1edab43e7c0d..65c4835caa33 100644
+index 964dd598f102..7379a1ba06d1 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)
+@@ -43,7 +43,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})

ports/llvm-12/0010-fix-libffi.patch

@@ -0,0 +1,16 @@
+ llvm/cmake/config-ix.cmake | 2 +-
+ 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
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI )
+     message(FATAL_ERROR "libffi includes are not found.")
+   endif()
+
+-  find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR})
++  find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR})
+   if( NOT FFI_LIBRARY_PATH )
+     message(FATAL_ERROR "libffi is not found.")
+   endif()

ports/llvm-12/0011-fix-libxml2.patch

@@ -0,0 +1,34 @@
+ clang/tools/c-index-test/CMakeLists.txt | 6 +-----
+ lldb/cmake/modules/LLDBConfig.cmake     | 2 +-
+ 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
+--- 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
+
+ # If libxml2 is available, make it available for c-index-test.
+ if (CLANG_HAVE_LIBXML)
+-  if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}))
+-    include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})
+-  else()
+-    include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
+-  endif()
++  include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS})
+   target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES})
+ endif()
+
+diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
+index 2fdf1502d..beeeeb9b1 100644
+--- a/lldb/cmake/modules/LLDBConfig.cmake
++++ b/lldb/cmake/modules/LLDBConfig.cmake
+@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA)
+ endif()
+
+ if (LLDB_ENABLE_LIBXML2)
+-  include_directories(${LIBXML2_INCLUDE_DIR})
++  include_directories(${LIBXML2_INCLUDE_DIRS})
+ endif()
+
+ include_directories(BEFORE

ports/llvm-12/clang_usage

@@ -0,0 +1,5 @@
+The package clang provides CMake targets:
+
+    find_package(Clang CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${CLANG_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE clangBasic clangLex clangParse clangAST ...)

ports/llvm-12/flang_usage

@@ -0,0 +1,5 @@
+The package flang provides CMake targets:
+
+    find_package(Flang CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${FLANG_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE flangFrontend flangFrontendTool ...)

ports/llvm-12/lld_usage

@@ -0,0 +1,5 @@
+The package lld provides CMake targets:
+
+    find_package(LLD CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${LLD_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE lldCommon lldCore lldDriver ...)

ports/llvm-12/llvm_usage

@@ -0,0 +1,15 @@
+The package llvm provides CMake targets:
+
+    find_package(LLVM CONFIG REQUIRED)
+
+    list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
+    include(HandleLLVMOptions)
+    add_definitions(${LLVM_DEFINITIONS})
+
+    target_include_directories(main PRIVATE ${LLVM_INCLUDE_DIRS})
+
+    # Find the libraries that correspond to the LLVM components that we wish to use
+    llvm_map_components_to_libnames(llvm_libs Support Core IRReader ...)
+
+    # Link against LLVM libraries
+    target_link_libraries(main PRIVATE ${llvm_libs})

ports/llvm-12/mlir_usage

@@ -0,0 +1,5 @@
+The package lld provides CMake targets:
+
+    find_package(MLIR CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${MLIR_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE MLIRIR MLIRParser MLIRPass MLIRSupport ...)

ports/llvm-12/portfile.cmake

@@ -9,13 +9,15 @@ vcpkg_from_github(
     SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
     HEAD_REF main
     PATCHES
-        0001-fix-install-paths.patch
-        0002-fix-openmp-debug.patch
-        0003-fix-dr-1734.patch
-        0004-fix-tools-path.patch
-        0005-fix-compiler-rt-install-path.patch
-        0006-fix-libcxx-install.patch
-        0007-fix-tools-install-path.patch
+        0002-fix-install-paths.patch
+        0003-fix-openmp-debug.patch
+        0004-fix-dr-1734.patch
+        0005-fix-tools-path.patch
+        0007-fix-compiler-rt-install-path.patch
+        0008-fix-libcxx-install.patch
+        0009-fix-tools-install-path.patch
+        0010-fix-libffi.patch
+        0011-fix-libxml2.patch
         0020-remove-FindZ3.cmake.patch
         0021-fix-FindZ3.cmake.patch
         0022-llvm-config-bin-path.patch