proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-17 17:05:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-12-16 14:55:56 +01:00
parent a58068ab6e
commit e54df6f5cb
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/patches/compilerrt-builtins-arch-fix-armhf.diff vendored
View File

@ -1,10 +1,10 @@
fix builtins armhf default arch detection by adding the same armhf triple fix builtins armhf default arch detection by adding the same armhf triple
handling use for compiler-rt handling use for compiler-rt
Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/builtins/CMakeLists.txt Index: llvm-toolchain-13-13.0.1~+rc1/compiler-rt/lib/builtins/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-12_12.0.1.orig/compiler-rt/lib/builtins/CMakeLists.txt --- llvm-toolchain-13-13.0.1~+rc1.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-12_12.0.1/compiler-rt/lib/builtins/CMakeLists.txt +++ llvm-toolchain-13-13.0.1~+rc1/compiler-rt/lib/builtins/CMakeLists.txt
@@ -16,6 +16,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR @@ -17,6 +17,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
load_llvm_config() load_llvm_config()
construct_compiler_rt_default_triple() construct_compiler_rt_default_triple()

11
debian/patches/libcxxabi-fix-link-builtins.diff vendored
View File

@ -1,16 +1,17 @@
if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library
flags, otherwise add libgcc following how libunwind does the same flags, otherwise add libgcc following how libunwind does the same
Index: llvm-toolchain-12_12.0.1/libcxxabi/src/CMakeLists.txt Index: llvm-toolchain-13-13.0.1~+rc1/libcxxabi/src/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-12_12.0.1.orig/libcxxabi/src/CMakeLists.txt --- llvm-toolchain-13-13.0.1~+rc1.orig/libcxxabi/src/CMakeLists.txt
+++ llvm-toolchain-12_12.0.1/libcxxabi/src/CMakeLists.txt +++ llvm-toolchain-13-13.0.1~+rc1/libcxxabi/src/CMakeLists.txt
@@ -104,7 +104,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL L @@ -111,7 +111,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL L
list(APPEND LIBCXXABI_LIBRARIES android_support) list(APPEND LIBCXXABI_LIBRARIES android_support)
endif() endif()
-if (NOT LIBCXXABI_USE_COMPILER_RT) -if (NOT LIBCXXABI_USE_COMPILER_RT)
+if (LIBCXXABI_USE_COMPILER_RT) +if (LIBCXXABI_USE_COMPILER_RT)
+ add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}") + add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}")
+else() +else()
add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc) add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc)
endif () endif ()

8
debian/patches/llvm-runtimes-builtins-build-check.diff vendored
View File

@ -1,10 +1,10 @@
add a check and only set up and build compiler-rt builtins if they have add a check and only set up and build compiler-rt builtins if they have
not been disabled not been disabled
Index: llvm-toolchain-12_12.0.1/llvm/runtimes/CMakeLists.txt Index: llvm-toolchain-13-13.0.1~+rc1/llvm/runtimes/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-12_12.0.1.orig/llvm/runtimes/CMakeLists.txt --- llvm-toolchain-13-13.0.1~+rc1.orig/llvm/runtimes/CMakeLists.txt
+++ llvm-toolchain-12_12.0.1/llvm/runtimes/CMakeLists.txt +++ llvm-toolchain-13-13.0.1~+rc1/llvm/runtimes/CMakeLists.txt
@@ -131,7 +131,12 @@ endfunction() @@ -129,7 +129,12 @@ endfunction()
# is required because the other runtimes need the builtin libraries present # is required because the other runtimes need the builtin libraries present
# before the just-built compiler can pass the configuration tests. # before the just-built compiler can pass the configuration tests.
get_compiler_rt_path(compiler_rt_path) get_compiler_rt_path(compiler_rt_path)

16
debian/patches/use-gold-for-compiler-rt-when-set.diff vendored
View File

@ -1,8 +1,9 @@
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt Index: llvm-toolchain-13-13.0.1~+rc1/llvm/runtimes/CMakeLists.txt
--- a/llvm/runtimes/CMakeLists.txt ===================================================================
+++ b/llvm/runtimes/CMakeLists.txt --- llvm-toolchain-13-13.0.1~+rc1.orig/llvm/runtimes/CMakeLists.txt
@@ -242,6 +242,8 @@ +++ llvm-toolchain-13-13.0.1~+rc1/llvm/runtimes/CMakeLists.txt
${COMMON_CMAKE_ARGS} @@ -244,6 +244,8 @@ function(runtime_default_target)
-DCMAKE_ASM_COMPILER_WORKS=ON
${RUNTIMES_CMAKE_ARGS} ${RUNTIMES_CMAKE_ARGS}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
+ LLVM_USE_LLD + LLVM_USE_LLD
@ -10,13 +11,12 @@ diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
${ARG_PREFIXES} ${ARG_PREFIXES}
EXTRA_TARGETS ${extra_targets} EXTRA_TARGETS ${extra_targets}
${test_targets} ${test_targets}
@@ -345,6 +347,8 @@ @@ -345,6 +347,8 @@ function(runtime_register_target name ta
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-DLLVM_RUNTIMES_TARGET=${name} -DLLVM_RUNTIMES_TARGET=${name}
${COMMON_CMAKE_ARGS}
${${name}_extra_args} ${${name}_extra_args}
+ PASSTHROUGH_PREFIXES LLVM_USE_LLD + PASSTHROUGH_PREFIXES LLVM_USE_LLD
+ LLVM_USE_LINKER + LLVM_USE_LINKER
EXTRA_TARGETS ${${name}_extra_targets} EXTRA_TARGETS ${${name}_extra_targets}
${${name}_test_targets} ${${name}_test_targets}
USE_TOOLCHAIN USE_TOOLCHAIN