diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 8 | ||||
| -rw-r--r-- | test/Driver/asan-ld.c | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index ab00118244..92f41063e2 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1512,7 +1512,7 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args, llvm::sys::path::append(LibAsan, "lib", "linux", (Twine("libclang_rt.asan-") + TC.getArchName() + "-android.so")); - CmdArgs.push_back(Args.MakeArgString(LibAsan)); + CmdArgs.insert(CmdArgs.begin(), Args.MakeArgString(LibAsan)); } else { if (!Args.hasArg(options::OPT_shared)) { // LibAsan is "libclang_rt.asan-<ArchName>.a" in the Linux library @@ -1521,7 +1521,11 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args, llvm::sys::path::append(LibAsan, "lib", "linux", (Twine("libclang_rt.asan-") + TC.getArchName() + ".a")); - CmdArgs.push_back(Args.MakeArgString(LibAsan)); + // 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)); CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-ldl"); CmdArgs.push_back("-export-dynamic"); diff --git a/test/Driver/asan-ld.c b/test/Driver/asan-ld.c index 9d8cbeca0d..b90082a262 100644 --- a/test/Driver/asan-ld.c +++ b/test/Driver/asan-ld.c @@ -24,7 +24,17 @@ // CHECK-LINUX-CXX: "-ldl" // CHECK-LINUX-CXX: "-export-dynamic" // CHECK-LINUX-CXX: stdc++ + +// RUN: %clang -no-canonical-prefixes %s -### -o /dev/null -fsanitize=address \ +// RUN: -target i386-unknown-linux --sysroot=%S/Inputs/basic_linux_tree \ +// RUN: -lstdc++ -static 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-LINUX-CXX-STATIC %s // +// 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: stdc++ + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: -target arm-linux-androideabi -fsanitize=address \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ |