mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-02 12:22:12 +00:00
rebase of the patches
This commit is contained in:
parent
3d7c7a2a79
commit
b881926a84
16
debian/patches/lldb/lldb-soname.diff
vendored
16
debian/patches/lldb/lldb-soname.diff
vendored
@ -2,13 +2,13 @@
|
||||
lldb/source/API/CMakeLists.txt | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/API/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt
|
||||
@@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA)
|
||||
set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp)
|
||||
endif()
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/lldb/source/API/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt
|
||||
@@ -24,7 +24,12 @@ lldb_tablegen(../../include/lldb/API/SBL
|
||||
SOURCE ${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat/Dwarf.def
|
||||
TARGET lldb-sbapi-dwarf-enums)
|
||||
|
||||
-add_lldb_library(liblldb SHARED ${option_framework}
|
||||
+set(output_name lldb)
|
||||
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/
|
||||
SBAddress.cpp
|
||||
SBAttachInfo.cpp
|
||||
SBBlock.cpp
|
||||
@@ -169,7 +174,7 @@ endif()
|
||||
@@ -176,7 +181,7 @@ endif()
|
||||
|
||||
set_target_properties(liblldb
|
||||
PROPERTIES
|
||||
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/
|
||||
)
|
||||
|
||||
target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB)
|
||||
@@ -235,12 +240,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
|
||||
@@ -242,12 +247,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
|
||||
set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc")
|
||||
endif()
|
||||
|
||||
|
56
debian/patches/openmp-fix-runtimes-build.diff
vendored
56
debian/patches/openmp-fix-runtimes-build.diff
vendored
@ -2,10 +2,10 @@ 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_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt
|
||||
@@ -247,6 +247,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}
|
||||
@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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)
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt
|
||||
@@ -129,6 +129,28 @@ else()
|
||||
get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
|
||||
endif()
|
||||
@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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)
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt
|
||||
@@ -52,6 +52,8 @@ else()
|
||||
" Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
|
||||
endif()
|
||||
@ -69,24 +69,26 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-
|
||||
# Install plugin under the lib destination folder.
|
||||
install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}")
|
||||
set_target_properties(omptarget.rtl.cuda PROPERTIES
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt
|
||||
@@ -49,6 +49,9 @@ add_llvm_library(omptarget
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt
|
||||
@@ -50,7 +50,10 @@ add_llvm_library(omptarget
|
||||
NO_INSTALL_RPATH
|
||||
BUILDTREE_ONLY
|
||||
)
|
||||
-target_include_directories(omptarget PRIVATE
|
||||
+
|
||||
+add_runtimes_build_depends_if_needed(omptarget)
|
||||
+
|
||||
target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
|
||||
+target_include_directories(omptarget PRIVATE
|
||||
${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt
|
||||
@@ -323,6 +323,10 @@ if(LIBOMP_STATS)
|
||||
set(LIBOMP_USE_STDCPPLIB TRUE)
|
||||
endif()
|
||||
@ -98,10 +100,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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?")
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt
|
||||
@@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM
|
||||
if(NOT ${LIBOMP_USE_STDCPPLIB})
|
||||
set(LIBOMP_LINKER_LANGUAGE C)
|
||||
@ -119,10 +121,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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)
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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)
|
||||
@ -133,10 +135,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/arc
|
||||
install(TARGETS archer archer_static
|
||||
LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
|
||||
Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt
|
||||
@@ -31,6 +31,8 @@ else()
|
||||
target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user