clang: Fix llvm-link and opt dependency build failure in libomp

Update to latest 13.x as well

  * 9e41dc71b8d4 [docs] Mention that the legacy PM is deprecated and will be removed after 14
  * 73c36a9be558 [OpenMP][FIX] Allow declare variant to work with reference types
  * bcb43617cb7f [NewPM] Add missing LTO ArgPromotion pass
  * 703ee975d26a [AlignFromAssume] Bailout w/non-constant alignments (pr51680)

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 105 insertions, 23 deletions

diff --git a/recipes-devtools/clang/clang/0037-Revert-libomptarget-amdcgn-Add-build-dependency-for-.patch b/recipes-devtools/clang/clang/0037-Revert-libomptarget-amdcgn-Add-build-dependency-for-.patch
deleted file mode 100644
index 66463a2..0000000
--- a/recipes-devtools/clang/clang/0037-Revert-libomptarget-amdcgn-Add-build-dependency-for-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d23235c2b03957e6b1f55068808e33419896ee4d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Aug 2021 16:45:24 -0700
-Subject: [PATCH] Revert "[libomptarget][amdcgn] Add build dependency for opt"
-
-This reverts commit ab2d8f0749745663d1f029ee4c88fbc492bef00f.
----
- openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
-index 4765d1989e52..8fec7dc6f17d 100644
---- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
-+++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
-@@ -157,7 +157,7 @@ foreach(mcpu ${mcpus})
-   add_custom_command(
-     OUTPUT ${bc_libname}
-     COMMAND ${LINK_TOOL} ${bc_files} | ${OPT_TOOL} --always-inline -o ${OUTPUTDIR}/${bc_libname}
--    DEPENDS ${bc_files} opt)
-+    DEPENDS ${bc_files})
- 
-   add_custom_target(lib${libname}-${mcpu} ALL DEPENDS ${bc_libname})
- 
diff --git a/recipes-devtools/clang/clang/D108404.diff b/recipes-devtools/clang/clang/D108404.diff
new file mode 100644
index 0000000..68d8ebc
--- /dev/null
+++ b/recipes-devtools/clang/clang/D108404.diff
@@ -0,0 +1,58 @@
+Backported from https://reviews.llvm.org/D108404
+
+diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
+--- a/llvm/runtimes/CMakeLists.txt
++++ b/llvm/runtimes/CMakeLists.txt
+@@ -350,15 +350,19 @@
+   # Create a runtimes target that uses this file as its top-level CMake file.
+   # The runtimes target is a configuration of all the runtime libraries
+   # together in a single CMake invocaiton.
++  if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
++    message(STATUS "Adding dependencies opt llvm-link")
++    set(extra_deps opt llvm-link)
++  endif()
+   if(NOT LLVM_RUNTIME_TARGETS)
+     runtime_default_target(
+-      DEPENDS ${deps}
++      DEPENDS ${deps} ${extra_deps}
+       PREFIXES ${prefixes})
+     set(test_targets check-runtimes)
+   else()
+     if("default" IN_LIST LLVM_RUNTIME_TARGETS)
+       runtime_default_target(
+-        DEPENDS ${deps}
++        DEPENDS ${deps} ${extra_deps}
+         PREFIXES ${prefixes})
+       list(REMOVE_ITEM LLVM_RUNTIME_TARGETS "default")
+     else()
+diff --git a/openmp/libomptarget/DeviceRTL/CMakeLists.txt b/openmp/libomptarget/DeviceRTL/CMakeLists.txt
+--- a/openmp/libomptarget/DeviceRTL/CMakeLists.txt
++++ b/openmp/libomptarget/DeviceRTL/CMakeLists.txt
+@@ -151,6 +151,7 @@
+
+ # Create target to build all Bitcode libraries.
+ add_custom_target(omptarget-new-nvptx-bc)
++add_dependencies(omptarget-new-nvptx-bc opt llvm-link)
+
+ # Generate a Bitcode library for all the compute capabilities the user requested
+ foreach(sm ${nvptx_sm_list})
+@@ -197,6 +198,7 @@
+
+   add_custom_target(${bclib_target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name}_opt)
+   add_dependencies(omptarget-new-nvptx-bc ${bclib_target_name})
++  add_dependencies(${bclib_target_name} opt llvm-link)
+
+   # Copy library to destination.
+   add_custom_command(TARGET ${bclib_target_name} POST_BUILD
+diff --git a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+--- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
++++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+@@ -157,7 +157,7 @@
+   add_custom_command(
+     OUTPUT ${bc_libname}
+     COMMAND ${LINK_TOOL} ${bc_files} | ${OPT_TOOL} --always-inline -o ${OUTPUTDIR}/${bc_libname}
+-    DEPENDS ${bc_files} opt)
++    DEPENDS ${bc_files} llvm-link opt)
+
+   add_custom_target(lib${libname}-${mcpu} ALL DEPENDS ${bc_libname})
+
diff --git a/recipes-devtools/clang/clang/D108868.diff b/recipes-devtools/clang/clang/D108868.diff
new file mode 100644
index 0000000..a12a3eb
--- /dev/null
+++ b/recipes-devtools/clang/clang/D108868.diff
@@ -0,0 +1,47 @@
+Backported from https://reviews.llvm.org/D108868
+
+--- a/llvm/runtimes/CMakeLists.txt
++++ b/llvm/runtimes/CMakeLists.txt
+@@ -350,9 +350,14 @@ if(runtimes)
+   # Create a runtimes target that uses this file as its top-level CMake file.
+   # The runtimes target is a configuration of all the runtime libraries
+   # together in a single CMake invocaiton.
++  set(extra_deps "")
+   if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
+-    message(STATUS "Adding dependencies opt llvm-link")
+-    set(extra_deps opt llvm-link)
++    if(TARGET opt)
++      list(APPEND extra_deps opt)
++    endif()
++    if(TARGET llvm-link)
++      list(APPEND extra_deps llvm-link)
++    endif()
+   endif()
+   if(NOT LLVM_RUNTIME_TARGETS)
+     runtime_default_target(
+--- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
++++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+@@ -149,6 +149,14 @@ endmacro()
+ 
+ set(libname "omptarget-amdgcn")
+ 
++set(toolchain_deps "")
++if(TARGET llvm-link)
++  list(APPEND toolchain_deps llvm-link)
++endif()
++if(TARGET opt)
++  list(APPEND toolchain_deps opt)
++endif()
++
+ foreach(mcpu ${mcpus})
+   set(bc_files)
+   add_cuda_bc_library(${cuda_sources})
+@@ -157,7 +165,7 @@ foreach(mcpu ${mcpus})
+   add_custom_command(
+     OUTPUT ${bc_libname}
+     COMMAND ${LINK_TOOL} ${bc_files} | ${OPT_TOOL} --always-inline -o ${OUTPUTDIR}/${bc_libname}
+-    DEPENDS ${bc_files} llvm-link opt)
++    DEPENDS ${bc_files} ${toolchain_deps})
+ 
+   add_custom_target(lib${libname}-${mcpu} ALL DEPENDS ${bc_libname})
+