mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2026-01-08 10:44:59 +00:00
rebase of the patches
This commit is contained in:
Sylvestre Ledru
parent
a8b29745fe
commit
bc9798b7ae
8
debian/patches/force-sse2-compiler-rt.diff
vendored
8
debian/patches/force-sse2-compiler-rt.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
@@ -700,8 +700,11 @@ else ()
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
@@ -708,8 +708,11 @@ else ()
|
||||
if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
|
||||
append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
|
||||
endif()
|
||||
|
||||
66
debian/patches/openmp-fix-runtimes-build.diff
vendored
66
debian/patches/openmp-fix-runtimes-build.diff
vendored
@ -1,11 +1,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
|
||||
Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/llvm/runtimes/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/llvm/runtimes/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/llvm/runtimes/CMakeLists.txt
|
||||
@@ -245,6 +245,7 @@ function(runtime_default_target)
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/llvm/runtimes/CMakeLists.txt
|
||||
@@ -229,6 +229,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_default}
|
||||
-DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
|
||||
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/llvm/runtimes/CM
|
||||
-DCMAKE_C_COMPILER_WORKS=ON
|
||||
-DCMAKE_CXX_COMPILER_WORKS=ON
|
||||
-DCMAKE_ASM_COMPILER_WORKS=ON
|
||||
@@ -472,7 +473,7 @@ if(runtimes)
|
||||
@@ -453,7 +454,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.
|
||||
@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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_15~++20220723123759+d959324e1efe/openmp/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/CMakeLists.txt
|
||||
@@ -77,6 +77,28 @@ option(OPENMP_ENABLE_LIBOMPTARGET_PROFIL
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/CMakeLists.txt
|
||||
@@ -82,6 +82,28 @@ option(OPENMP_ENABLE_LIBOMPTARGET_PROFIL
|
||||
${ENABLE_LIBOMPTARGET_PROFILING})
|
||||
option(OPENMP_ENABLE_LIBOMP_PROFILING "Enable time profiling for libomp." OFF)
|
||||
|
||||
@ -55,11 +55,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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_15~++20220723123759+d959324e1efe/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
@@ -52,6 +52,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/plugins/CMakeLists.txt
|
||||
@@ -51,6 +51,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
|
||||
NO_INSTALL_RPATH
|
||||
)
|
||||
|
||||
@ -68,11 +68,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptar
|
||||
# Install plugin under the lib destination folder.
|
||||
install(TARGETS "omptarget.rtl.${tmachine_libname}"
|
||||
LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
|
||||
Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
@@ -88,6 +88,8 @@ else()
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/plugins/cuda/CMakeLists.txt
|
||||
@@ -87,6 +87,8 @@ else()
|
||||
endif()
|
||||
add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx)
|
||||
|
||||
@ -81,12 +81,12 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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
|
||||
Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptarget/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/libomptarget/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptarget/src/CMakeLists.txt
|
||||
@@ -35,7 +35,9 @@ add_llvm_library(omptarget
|
||||
${CMAKE_DL_LIBS}
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/libomptarget/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/libomptarget/src/CMakeLists.txt
|
||||
@@ -34,7 +34,9 @@ add_llvm_library(omptarget
|
||||
PRIVATE
|
||||
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
|
||||
NO_INSTALL_RPATH
|
||||
-)
|
||||
@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/libomptar
|
||||
target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
|
||||
|
||||
# libomptarget.so needs to be aware of where the plugins live as they
|
||||
Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/runtime/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/runtime/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/runtime/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/runtime/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/runtime/CMakeLists.txt
|
||||
@@ -287,6 +287,10 @@ if(LIBOMP_STATS)
|
||||
set(LIBOMP_USE_STDCPPLIB TRUE)
|
||||
endif()
|
||||
@ -111,11 +111,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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_15~++20220723123759+d959324e1efe/openmp/runtime/src/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/runtime/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/runtime/src/CMakeLists.txt
|
||||
@@ -133,6 +133,7 @@ endif()
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/runtime/src/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/runtime/src/CMakeLists.txt
|
||||
@@ -135,6 +135,7 @@ endif()
|
||||
if(NOT ${LIBOMP_USE_STDCPPLIB})
|
||||
set(LIBOMP_LINKER_LANGUAGE C)
|
||||
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
|
||||
@ -123,7 +123,7 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/runtime/s
|
||||
else()
|
||||
set(LIBOMP_LINKER_LANGUAGE CXX)
|
||||
endif()
|
||||
@@ -190,6 +191,8 @@ else()
|
||||
@@ -196,6 +197,8 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
@ -132,10 +132,10 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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_15~++20220723123759+d959324e1efe/openmp/tools/archer/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/tools/archer/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/openmp/tools/archer/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3.orig/openmp/tools/archer/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_16~++20220824111340+4d3134866fb3/openmp/tools/archer/CMakeLists.txt
|
||||
@@ -14,6 +14,9 @@ if(LIBOMP_OMPT_SUPPORT)
|
||||
add_library(archer SHARED ompt-tsan.cpp)
|
||||
add_library(archer_static STATIC ompt-tsan.cpp)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user