I addressed your comments and simplified the patch, please take another
look.
Thanks!
--kcc
On Mon, Nov 21, 2011 at 4:36 PM, Chandler Carruth <[email protected]>wrote:
> Comments on the codereview app...
>
> On Mon, Nov 21, 2011 at 12:28 PM, Kostya Serebryany <[email protected]>wrote:
>
>> Hello,
>>
>> Please consider the following patch that adds linker flags required for
>> AddressSanitizer.
>> This is Linux-only, the Darwin patch is a bit trickier and will go
>> separately.
>> http://codereview.appspot.com/5416061/
>>
>> Thanks,
>>
>> --kcc
>>
>> _______________________________________________
>> cfe-commits mailing list
>> [email protected]
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>>
>
Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp (revision 145053)
+++ lib/Driver/Tools.cpp (working copy)
@@ -1090,6 +1090,26 @@
RelaxDefault);
}
+/// If AddressSanitizer is enabled, add appropriate linker flags (Linux).
+static void addAsanRT(const ToolChain &TC, const ArgList &Args,
+ ArgStringList &CmdArgs) {
+ // Add asan linker flags when linking an executable, but not a shared object.
+ if (Args.hasArg(options::OPT_shared) ||
+ !Args.hasFlag(options::OPT_faddress_sanitizer,
+ options::OPT_fno_address_sanitizer, false))
+ return;
+ // LibAsan is "../lib/clang/linux/ArchName/libclang_rt.asan.a
+ llvm::SmallString<128> LibAsan =
+ llvm::sys::path::parent_path(StringRef(TC.getDriver().Dir));
+ llvm::sys::path::append(LibAsan, "lib", "clang", "linux", TC.getArchName());
+ llvm::sys::path::append(LibAsan, "libclang_rt.asan.a");
+ CmdArgs.push_back(Args.MakeArgString(LibAsan));
+ CmdArgs.push_back("-lpthread");
+ CmdArgs.push_back("-ldl");
+ CmdArgs.push_back("-export-dynamic");
+ TC.AddCXXStdlibLibArgs(Args, CmdArgs);
+}
+
void Clang::ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output,
const InputInfoList &Inputs,
@@ -4434,6 +4454,8 @@
CmdArgs.push_back("-Bdynamic");
CmdArgs.push_back("-lm");
}
+
+ addAsanRT(getToolChain(), Args, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib)) {
if (Args.hasArg(options::OPT_static))
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
