proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-10-19 10:32:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update of the patches (rebase and applied upstream)

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-04-05 23:00:25 +02:00
parent 295c8ea5cd
commit f6ae83b7c4
3 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/patches/0044-soname.diff vendored
View File

@ -3,10 +3,10 @@
tools/llvm-shlib/CMakeLists.txt | 1 + tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/clang/tools/libclang/CMakeLists.txt Index: llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/clang/tools/libclang/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0.orig/clang/tools/libclang/CMakeLists.txt --- llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/clang/tools/libclang/CMakeLists.txt +++ llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/clang/tools/libclang/CMakeLists.txt
@@ -96,7 +96,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE @@ -96,7 +96,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700") remove_definitions("-D_XOPEN_SOURCE=700")
endif() endif()
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/clang/tools/libc
OUTPUT_NAME ${output_name} OUTPUT_NAME ${output_name}
${SOURCES} ${SOURCES}
Index: llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/llvm/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/llvm/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0.orig/llvm/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/llvm/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif() endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_13~++20210402105632+a4ac847c8ef0/llvm/tools/llvm-
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+ +
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
# Link against the object libraries instead of static libraries. OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")

50
debian/patches/revert-D95727-causes-49818.diff vendored
View File

@ -1,50 +0,0 @@
commit 43ceb74eb1a5801662419fb66a6bf0d5414f1ec5
Author: Tom Stellard <tstellar@redhat.com>
Date: Wed Mar 31 21:35:04 2021 -0700
llvm-shlib: Create object libraries for each component and link against them
This makes it possible to build libLLVM.so without first creating a
static library for each component. In the case where only libLLVM.so is
built (i.e. ninja LLVM) this eliminates 150 linker jobs.
Reviewed By: stellaraccident
Differential Revision: https://reviews.llvm.org/D95727
Index: llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd/llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd.orig/llvm/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd/llvm/cmake/modules/AddLLVM.cmake
@@ -488,7 +488,6 @@ function(llvm_add_library name)
add_dependencies(${obj_name} ${link_lib})
endif()
endforeach()
- target_link_libraries(${obj_name} ${ARG_LINK_LIBS})
endif()
endif()
@@ -747,7 +746,7 @@ function(add_llvm_component_library name
"COMPONENT_NAME;ADD_TO_COMPONENT"
""
${ARGN})
- add_llvm_library(${name} COMPONENT_LIB OBJECT ${ARG_UNPARSED_ARGUMENTS})
+ add_llvm_library(${name} COMPONENT_LIB ${ARG_UNPARSED_ARGUMENTS})
string(REGEX REPLACE "^LLVM" "" component_name ${name})
set_property(TARGET ${name} PROPERTY LLVM_COMPONENT_NAME ${component_name})
Index: llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd/llvm/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_13~++20210403101115+95f448aa86cd/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -35,10 +35,6 @@ if(LLVM_BUILD_LLVM_DYLIB)
set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
list(REMOVE_DUPLICATES LIB_NAMES)
-
- # Link against the object libraries instead of static libraries.
- list(TRANSFORM LIB_NAMES PREPEND "obj.")
-
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")

1
debian/patches/series vendored
View File

@ -145,4 +145,3 @@ print-lldb-path.patch
libcxx-armhf-ftbfs.diff libcxx-armhf-ftbfs.diff
lld-use-link-atomic-i386.diff lld-use-link-atomic-i386.diff
lower-python-dep.diff lower-python-dep.diff
revert-D95727-causes-49818.diff