From 11fe47dbfed41218df9f6c5e4f4e75bee0c4ad77 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Jan 2019 13:24:59 -0800 Subject: Add libunwind to linker cmdline when using compiler-rt libunwind also drags in libpthread and libdl so add those too Signed-off-by: Khem Raj --- ...lang-Append-libunwind-to-compiler-rt-for-linking.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch b/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch index 4f008f6..7fc5795 100644 --- a/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch +++ b/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch @@ -1,4 +1,4 @@ -From 53ff7e84ddaf2a82733c4fcb321afa1d54e2516b Mon Sep 17 00:00:00 2001 +From 89c9b5e2bec26bad047a60bd08722ff138cb7cb3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 25 Jan 2019 14:39:04 -0800 Subject: [PATCH] clang: Append libunwind to compiler-rt for linking @@ -8,20 +8,23 @@ too, and they are missing in compiler-rt but provided by llvm libunwind Signed-off-by: Khem Raj --- - clang/lib/Driver/ToolChains/CommonArgs.cpp | 3 +++ - 1 file changed, 3 insertions(+) + clang/lib/Driver/ToolChains/CommonArgs.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp -index 1161e8158d5..d4c346e7960 100644 +index d7e316befa6..72226dd09ce 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp -@@ -1190,6 +1190,9 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D, +@@ -1191,6 +1191,12 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D, switch (RLT) { case ToolChain::RLT_CompilerRT: CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins")); + CmdArgs.push_back("--as-needed"); -+ CmdArgs.push_back(Args.MakeArgString("-l:libgcc_eh.a")); ++ CmdArgs.push_back("-lunwind"); ++ CmdArgs.push_back("-lpthread"); ++ CmdArgs.push_back("-ldl"); + CmdArgs.push_back("--no-as-needed"); ++ break; case ToolChain::RLT_Libgcc: // Make sure libgcc is not used under MSVC environment by default -- cgit v1.2.3-54-g00ecf