From b061699a53c0dd13101375db2c5f34290dcdc709 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 26 Jan 2019 20:23:40 -0800 Subject: clang: Use -l:lib method to specify libunwind.a This makes sure that linker treats it as a library and not object Signed-off-by: Khem Raj --- ...lang-Append-libunwind-to-compiler-rt-for-linking.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 d5c67d1..9db055c 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 4b5386fe67b03923b7ce25c066e6f6220a32eb44 Mon Sep 17 00:00:00 2001 +From ee4557fd25d6d752eeb25d28b197ad8364c554d5 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,16 +8,21 @@ too, and they are missing in compiler-rt but provided by llvm libunwind Signed-off-by: Khem Raj --- - clang/lib/Driver/ToolChains/CommonArgs.cpp | 4 ++++ - 1 file changed, 4 insertions(+) + clang/lib/Driver/ToolChains/CommonArgs.cpp | 1 + + 1 file changed, 1 insertion(+) +diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp +index d7e316befa6..d2dd45eeb9a 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp -@@ -1191,6 +1191,7 @@ void tools::AddRunTimeLibs(const ToolCha +@@ -1191,6 +1191,7 @@ 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(Args.MakeArgString(D.SysRoot + "/usr/lib" "/libunwind.a")); ++ CmdArgs.push_back(Args.MakeArgString("-l:libunwind.a")); break; case ToolChain::RLT_Libgcc: // Make sure libgcc is not used under MSVC environment by default +-- +2.20.1 + -- cgit v1.2.3-54-g00ecf