2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e79dee9..cb2f0eb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-12  Wei Mi <wmi@google.com>
+
+	* gcc.c (LINK_COMMAND_SPEC): Add -lasan to link command if
+	-faddress-sanitizer is on.
+
 2012-11-12  Dodji Seketeli  <dodji@redhat.com>
 
 	* gimple.h (is_gimple_builtin_call): Declare ...
diff --git a/gcc/gcc.c b/gcc/gcc.c
index b80af44..2102771 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -687,6 +687,7 @@ proper position among the other output files.  */
     %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\
     %(mflib) " STACK_SPLIT_SPEC "\
     %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
+    %{faddress-sanitizer:-lasan}\
     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\
     %{!nostdlib:%{!nostartfiles:%E}} %{T*} }}}}}}"
 #endif