Done. r146703<div><br><br><div class="gmail_quote">On Thu, Dec 15, 2011 at 1:52 AM, Alexander Potapenko <span dir="ltr"><<a href="mailto:glider@google.com">glider@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I suggest to revert the asan_rtl.cc part, because we can't use ASAN_OPTIONS now.<br>
<div class="HOEnZb"><div class="h5"><br>
On Wed, Dec 14, 2011 at 4:19 AM, Kostya Serebryany <<a href="mailto:kcc@google.com">kcc@google.com</a>> wrote:<br>
> Author: kcc<br>
> Date: Tue Dec 13 18:19:03 2011<br>
> New Revision: 146529<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=146529&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=146529&view=rev</a><br>
> Log:<br>
> [asan] insert __asan_init into ".preinit_array" section. Linux-only.<br>
><br>
> Modified:<br>
>    compiler-rt/trunk/lib/asan/Makefile.old<br>
>    compiler-rt/trunk/lib/asan/asan_rtl.cc<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/Makefile.old<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=146529&r1=146528&r2=146529&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=146529&r1=146528&r2=146529&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/Makefile.old (original)<br>
> +++ compiler-rt/trunk/lib/asan/Makefile.old Tue Dec 13 18:19:03 2011<br>
> @@ -287,8 +287,6 @@<br>
>  $(LIBASAN_A): $(BIN) $(LIBASAN_OBJ) $(MAKEFILE)<br>
>        mkdir -p $(LIBASAN_INST_DIR)<br>
>        ar ru $@ $(LIBASAN_OBJ)<br>
> -       $(CXX) -shared $(CFLAGS) $(LIBASAN_OBJ) $(LD_FLAGS) -o $(BIN)/libasan$(SUFF).so<br>
> -<br>
><br>
>  TEST_OBJECTS_COMMON=\<br>
>             $(BIN)/asan_test$(SUFF).o \<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=146529&r1=146528&r2=146529&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=146529&r1=146528&r2=146529&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Dec 13 18:19:03 2011<br>
> @@ -774,3 +774,11 @@<br>
>     Report("AddressSanitizer Init done\n");<br>
>   }<br>
>  }<br>
> +<br>
> +#ifdef __linux__<br>
> +// On Linux, we force __asan_init to be called before anyone else<br>
> +// by placing it into .preinit_array section.<br>
> +// FIXME: do we have anything like this on Mac?<br>
> +__attribute__((section(".preinit_array")))<br>
> +  typeof(__asan_init) *__asan_preinit =__asan_init;<br>
> +#endif<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
<br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Alexander Potapenko<br>
Software Engineer<br>
Google Moscow<br>
</font></span></blockquote></div><br></div>