Skip to content

Commit ff324bc

Browse files
authored
Add a temporary workaround for 597 (#606)
This adds a patch file that reverts the order of libraries added on the command line to previously working one to avoid error about duplicate __aeabi_mem* symbols. This patch will be removed, once we implement a proper permanent solution in llvm-project.
1 parent 4e1a0e1 commit ff324bc

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp
2+
index eecaaa9a4293..7d07079b5dd4 100644
3+
--- a/clang/lib/Driver/ToolChains/BareMetal.cpp
4+
+++ b/clang/lib/Driver/ToolChains/BareMetal.cpp
5+
@@ -491,9 +491,8 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
6+
}
7+
8+
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
9+
- AddRunTimeLibs(TC, D, CmdArgs, Args);
10+
-
11+
CmdArgs.push_back("-lc");
12+
+ AddRunTimeLibs(TC, D, CmdArgs, Args);
13+
}
14+
15+
if (D.isUsingLTO()) {

0 commit comments

Comments
 (0)