mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-14 21:10:25 +00:00
erebase of the patches
This commit is contained in:
Sylvestre Ledru
parent
a30c862fd3
commit
e026db77d3
111
debian/patches/openmp-fix-runtimes-build.diff
vendored
111
debian/patches/openmp-fix-runtimes-build.diff
vendored
@ -2,17 +2,11 @@ include required runtimes as dependencies to openmp targets to make sure
|
||||
they are built first when included as part of a runtimes build since openmp
|
||||
can depend on them
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
@@ -231,6 +231,7 @@ function(runtime_default_target)
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
|
||||
@@ -236,6 +236,7 @@ function(runtime_default_target)
|
||||
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
|
||||
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
|
||||
-DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
|
||||
@ -20,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CM
|
||||
-DCMAKE_C_COMPILER_WORKS=ON
|
||||
-DCMAKE_CXX_COMPILER_WORKS=ON
|
||||
-DCMAKE_ASM_COMPILER_WORKS=ON
|
||||
@@ -480,7 +481,7 @@ if(runtimes)
|
||||
@@ -496,7 +497,7 @@ if(runtimes)
|
||||
# build directory cannot find the C++ headers in certain configurations.
|
||||
# I need to build a mechanism for runtime projects to provide CMake code
|
||||
# that executes at LLVM configuration time to handle this case.
|
||||
@ -29,17 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CM
|
||||
# We need to add the runtimes as a dependency because compiler-rt can be
|
||||
# built as part of runtimes and we need the profile runtime for PGO
|
||||
add_dependencies(clang-bootstrap-deps runtimes)
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
|
||||
@@ -91,6 +91,28 @@ else()
|
||||
set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
|
||||
endif()
|
||||
@ -69,17 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeList
|
||||
# Build host runtime library, after LIBOMPTARGET variables are set since they are needed
|
||||
# to enable time profiling support in the OpenMP runtime.
|
||||
add_subdirectory(runtime)
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
@@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
|
||||
NO_INSTALL_RPATH
|
||||
)
|
||||
@ -89,18 +69,11 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptar
|
||||
# Install plugin under the lib destination folder.
|
||||
install(TARGETS "omptarget.rtl.${tmachine_libname}"
|
||||
LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
@@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
@@ -55,6 +55,8 @@ endif()
|
||||
target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
|
||||
target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
|
||||
|
||||
@ -109,17 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptar
|
||||
# Install plugin under the lib destination folder.
|
||||
install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
|
||||
set_target_properties(omptarget.rtl.cuda PROPERTIES
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
|
||||
@@ -35,7 +35,9 @@ add_llvm_library(omptarget
|
||||
PRIVATE
|
||||
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
|
||||
@ -131,17 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptar
|
||||
target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
|
||||
|
||||
# libomptarget.so needs to be aware of where the plugins live as they
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
|
||||
@@ -292,6 +292,10 @@ if(LIBOMP_STATS)
|
||||
set(LIBOMP_USE_STDCPPLIB TRUE)
|
||||
endif()
|
||||
@ -153,17 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/C
|
||||
# Shared library can be switched to a static library
|
||||
set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
|
||||
"Shared library instead of static library?")
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
|
||||
@@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
|
||||
if(NOT ${LIBOMP_USE_STDCPPLIB})
|
||||
set(LIBOMP_LINKER_LANGUAGE C)
|
||||
@ -181,18 +133,11 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/s
|
||||
# Get the library's location within the build tree for the unit tester
|
||||
if(NOT WIN32)
|
||||
get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
|
||||
<<<<<<< Updated upstream
|
||||
Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
|
||||
=======
|
||||
Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
|
||||
>>>>>>> Stashed changes
|
||||
@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
|
||||
--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
|
||||
@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
|
||||
target_link_libraries(archer ${CMAKE_DL_LIBS})
|
||||
add_library(archer_static STATIC ompt-tsan.cpp)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user