Add -whole-archive around the ASan runtime archive in the link command.

This ensures that even though it comes first, we pick up its .o files.
Note that if we can use this (or something similar / equivalent) on
other platforms, we could potentially remove
ReplaceOperatorsNewAndDelete from the ASan runtimes.

We should probably do something similar for TSan and MSan as well.

llvm-svn: 169328

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 92f4106..d5f191c 100644 (file)
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1524,8 +1524,14 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args,
       // The ASan runtime needs to come before -lstdc++ (or -lc++, libstdc++.a,
       // etc.) so that the linker picks ASan's versions of the global 'operator
       // new' and 'operator delete' symbols. We take the extreme (but simple)
-      // strategy of inserting it at the front of the link command.
-      CmdArgs.insert(CmdArgs.begin(), Args.MakeArgString(LibAsan));
+      // strategy of inserting it at the front of the link command. It also
+      // needs to be forced to end up in the executable, so wrap it in
+      // whole-archive.
+      SmallVector<const char*, 3> PrefixArgs;
+      PrefixArgs.push_back("-whole-archive");
+      PrefixArgs.push_back(Args.MakeArgString(LibAsan));
+      PrefixArgs.push_back("-no-whole-archive");
+      CmdArgs.insert(CmdArgs.begin(), PrefixArgs.begin(), PrefixArgs.end());
       CmdArgs.push_back("-lpthread");
       CmdArgs.push_back("-ldl");
       CmdArgs.push_back("-export-dynamic");

diff --git a/clang/test/Driver/asan-ld.c b/clang/test/Driver/asan-ld.c
index b90082a..cf2b695 100644 (file)
--- a/clang/test/Driver/asan-ld.c
+++ b/clang/test/Driver/asan-ld.c
@@ -19,7 +19,7 @@
 //
 // CHECK-LINUX-CXX: "{{.*}}ld{{(.exe)?}}"
 // CHECK-LINUX-CXX-NOT: "-lc"
-// CHECK-LINUX-CXX: libclang_rt.asan-i386.a"
+// CHECK-LINUX-CXX: "-whole-archive" "{{.*}}libclang_rt.asan-i386.a" "-no-whole-archive"
 // CHECK-LINUX-CXX: "-lpthread"
 // CHECK-LINUX-CXX: "-ldl"
 // CHECK-LINUX-CXX: "-export-dynamic"
@@ -32,7 +32,7 @@
 //
 // CHECK-LINUX-CXX-STATIC: "{{.*}}ld{{(.exe)?}}"
 // CHECK-LINUX-CXX-STATIC-NOT: stdc++
-// CHECK-LINUX-CXX-STATIC: libclang_rt.asan-i386.a"
+// CHECK-LINUX-CXX-STATIC: "-whole-archive" "{{.*}}libclang_rt.asan-i386.a" "-no-whole-archive"
 // CHECK-LINUX-CXX-STATIC: stdc++
 
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \