summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-01-16 22:47:32 +0000
committerKhem Raj <raj.khem@gmail.com>2020-06-03 08:39:57 -0700
commita5ed590a1183f2fb2745f47cd701c03c9737e4ca (patch)
treec8b6dea2890c93d988b3d8aa08935b2fadd3aaa0
parent2a6e94d0e0e8685a2c9a3e67e1c4ebcc4cb3b2c0 (diff)
downloadmeta-clang-a5ed590a1183f2fb2745f47cd701c03c9737e4ca.tar.gz
libcxx: Correct link failure due to missing __divti3
Add libgcc as defined by $CC to link of libc++. Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
-rw-r--r--recipes-devtools/clang/clang/0028-Add-libgcc-to-link-step-for-libcxx.patch30
-rw-r--r--recipes-devtools/clang/common.inc1
2 files changed, 31 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0028-Add-libgcc-to-link-step-for-libcxx.patch b/recipes-devtools/clang/clang/0028-Add-libgcc-to-link-step-for-libcxx.patch
new file mode 100644
index 0000000..9316599
--- /dev/null
+++ b/recipes-devtools/clang/clang/0028-Add-libgcc-to-link-step-for-libcxx.patch
@@ -0,0 +1,30 @@
1From 397bd558b83ce7ff3ea69c1c8fb6f36c624b9ca6 Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Thu, 16 Jan 2020 21:16:10 +0000
4Subject: [PATCH] Add libgcc to link step for libcxx
5
6This corrects "undefined reference to __divti3"
7
8Upstream-Status: Inappropriate [configuration]
9
10Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
11---
12 libcxx/src/CMakeLists.txt | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
16index 31cd24333a5..d8ae826d7f5 100644
17--- a/libcxx/src/CMakeLists.txt
18+++ b/libcxx/src/CMakeLists.txt
19@@ -234,7 +234,7 @@ if (LIBCXX_ENABLE_SHARED)
20 llvm_setup_rpath(cxx_shared)
21 endif()
22 cxx_link_system_libraries(cxx_shared)
23- target_link_libraries(cxx_shared PRIVATE ${LIBCXX_LIBRARIES})
24+ target_link_libraries(cxx_shared PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
25 set_target_properties(cxx_shared
26 PROPERTIES
27 COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
28--
292.13.3
30
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 044a9ab..6a976de 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -35,6 +35,7 @@ SRC_URI = "\
35 file://0025-llvm-Let-llvm-ar-name-contain-lib.patch \ 35 file://0025-llvm-Let-llvm-ar-name-contain-lib.patch \
36 file://0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch \ 36 file://0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch \
37 file://0027-Fix-sanitizer-common-build-with-glibc-2.31.patch \ 37 file://0027-Fix-sanitizer-common-build-with-glibc-2.31.patch \
38 file://0028-Add-libgcc-to-link-step-for-libcxx.patch \
38" 39"
39 40
40# Fallback to no-PIE if not set 41# Fallback to no-PIE if not set