Attachment 638846 Details for Bug 722978 – Patch

[patch] Patch

llvm.patch (text/plain), 5.99 KB, created by Arfrever Frehtes Taifersar Arahesis on 2020-05-14 10:09:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Arfrever Frehtes Taifersar Arahesis

Created: 2020-05-14 10:09:31 UTC

Size: 5.99 KB

patch

obsolete

>From 5e788f3592be44e72c19cdba5909d305e0431631 Mon Sep 17 00:00:00 2001
>From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
>Date: Thu, 14 May 2020 10:05:22 +0000
>Subject: [PATCH] sys-devel/llvm: Fix building with Clang with
> -rtlib=compiler-rt.
>
>Closes: https://bugs.gentoo.org/722978
>Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
>---
> .../llvm/files/9999/unwind_linking.patch      | 44 +++++++++++++++++++
> sys-devel/llvm/llvm-10.0.0.9999.ebuild        | 17 +++++++
> sys-devel/llvm/llvm-10.0.0.ebuild             | 17 +++++++
> sys-devel/llvm/llvm-11.0.0.9999.ebuild        | 17 +++++++
> 4 files changed, 95 insertions(+)
> create mode 100644 sys-devel/llvm/files/9999/unwind_linking.patch
>
>diff --git a/sys-devel/llvm/files/9999/unwind_linking.patch b/sys-devel/llvm/files/9999/unwind_linking.patch
>new file mode 100644
>index 00000000000..23f60f76906
>--- /dev/null
>+++ b/sys-devel/llvm/files/9999/unwind_linking.patch
>@@ -0,0 +1,44 @@
>+--- /CMakeLists.txt
>++++ /CMakeLists.txt
>+@@ -335,6 +335,7 @@ if(LLVM_ENABLE_BACKTRACES)
>+ endif()
>+ 
>+ option(LLVM_ENABLE_UNWIND_TABLES "Emit unwind tables for the libraries" ON)
>++set(UNWIND_LIBRARIES "" CACHE STRING "Additional libraries needed for unwind functions")
>+ 
>+ option(LLVM_ENABLE_CRASH_OVERRIDES "Enable crash overrides." ON)
>+ if(LLVM_ENABLE_CRASH_OVERRIDES)
>+--- /cmake/modules/AddLLVM.cmake
>++++ /cmake/modules/AddLLVM.cmake
>+@@ -641,6 +641,9 @@ function(llvm_add_library name)
>+       ${lib_deps}
>+       ${llvm_libs}
>+       )
>++  if(UNWIND_LIBRARIES)
>++    target_link_libraries(${name} PRIVATE -Wl,--push-state -Wl,--as-needed ${UNWIND_LIBRARIES} -Wl,--pop-state)
>++  endif()
>+ 
>+   if(LLVM_COMMON_DEPENDS)
>+     add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
>+@@ -868,6 +871,9 @@ macro(add_llvm_executable name)
>+     # API for all shared libaries loaded by this executable.
>+     target_link_libraries(${name} PRIVATE ${LLVM_PTHREAD_LIB})
>+   endif()
>++  if(UNWIND_LIBRARIES)
>++    target_link_libraries(${name} PRIVATE -Wl,--push-state -Wl,--as-needed ${UNWIND_LIBRARIES} -Wl,--pop-state)
>++  endif()
>+ 
>+   llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS} BUNDLE_PATH ${ARG_BUNDLE_PATH})
>+ endmacro(add_llvm_executable name)
>+--- /unittests/Support/DynamicLibrary/CMakeLists.txt
>++++ /unittests/Support/DynamicLibrary/CMakeLists.txt
>+@@ -26,6 +26,9 @@ function(dynlib_add_module NAME)
>+     PipSqueak.cpp
>+     )
>+   set_target_properties(${NAME} PROPERTIES FOLDER "Tests")
>++  if(UNWIND_LIBRARIES)
>++    target_link_libraries(${NAME} PRIVATE -Wl,--push-state -Wl,--as-needed ${UNWIND_LIBRARIES} -Wl,--pop-state)
>++  endif()
>+ 
>+   set_output_directory(${NAME}
>+     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
>diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
>index f308f41ee44..f1f6b2fb3af 100644
>--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
>+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
>@@ -174,6 +174,8 @@ src_prepare() {
> 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
> 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
> 
>+	eapply "${FILESDIR}"/9999/unwind_linking.patch
>+
> 	# disable use of SDK on OSX, bug #568758
> 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
> 
>@@ -372,6 +374,21 @@ multilib_src_configure() {
> 		)
> 	fi
> 
>+	if tc-is-clang; then
>+		local compiler_rt=$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -print-libgcc-file-name)
>+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
>+			if has_version sys-libs/llvm-libunwind; then
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=unwind
>+				)
>+			else
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=gcc_s
>+				)
>+			fi
>+		fi
>+	fi
>+
> #	Note: go bindings have no CMake rules at the moment
> #	but let's kill the check in case they are introduced
> #	if ! multilib_is_native_abi || ! use go; then
>diff --git a/sys-devel/llvm/llvm-10.0.0.ebuild b/sys-devel/llvm/llvm-10.0.0.ebuild
>index c36aefaa55f..f16508eeaae 100644
>--- a/sys-devel/llvm/llvm-10.0.0.ebuild
>+++ b/sys-devel/llvm/llvm-10.0.0.ebuild
>@@ -99,6 +99,8 @@ src_prepare() {
> 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
> 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
> 
>+	eapply "${FILESDIR}"/9999/unwind_linking.patch
>+
> 	# disable use of SDK on OSX, bug #568758
> 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
> 
>@@ -294,6 +296,21 @@ multilib_src_configure() {
> 		)
> 	fi
> 
>+	if tc-is-clang; then
>+		local compiler_rt=$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -print-libgcc-file-name)
>+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
>+			if has_version sys-libs/llvm-libunwind; then
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=unwind
>+				)
>+			else
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=gcc_s
>+				)
>+			fi
>+		fi
>+	fi
>+
> #	Note: go bindings have no CMake rules at the moment
> #	but let's kill the check in case they are introduced
> #	if ! multilib_is_native_abi || ! use go; then
>diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
>index f6ed4b7a9be..37d83153120 100644
>--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
>+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
>@@ -174,6 +174,8 @@ src_prepare() {
> 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
> 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
> 
>+	eapply "${FILESDIR}"/9999/unwind_linking.patch
>+
> 	# disable use of SDK on OSX, bug #568758
> 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
> 
>@@ -374,6 +376,21 @@ multilib_src_configure() {
> 		)
> 	fi
> 
>+	if tc-is-clang; then
>+		local compiler_rt=$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -print-libgcc-file-name)
>+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
>+			if has_version sys-libs/llvm-libunwind; then
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=unwind
>+				)
>+			else
>+				mycmakeargs+=(
>+					-DUNWIND_LIBRARIES=gcc_s
>+				)
>+			fi
>+		fi
>+	fi
>+
> #	Note: go bindings have no CMake rules at the moment
> #	but let's kill the check in case they are introduced
> #	if ! multilib_is_native_abi || ! use go; then
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 722978: 638840 | 638842 | 638844 | 638846