diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25dda30062c76f2d53e1aab577f311e835a128a8..2337fc93774be54f2c8b46bf142c211703fc7357 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c/55397
+	* cppbuiltin.c (define_builtin_macros_for_compilation_flags):
+	Define __SANITIZE_ADDRESS__ for flag_asan.
+
 2012-11-21  Wei Mi  <wmi@google.com>
 
 	* common.opt: Change faddress-sanitizer to fsanitize=address.
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index 05d82f5df499d426f29ab49499f9d7ffa1563b72..c3ca21a63af6d713071c63cf9717d7a010ff61d3 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -91,6 +91,9 @@ define_builtin_macros_for_compilation_flags (cpp_reader *pfile)
       cpp_define_formatted (pfile, "__PIE__=%d", flag_pie);
     }
 
+  if (flag_asan)
+    cpp_define (pfile, "__SANITIZE_ADDRESS__");
+
   if (optimize_size)
     cpp_define (pfile, "__OPTIMIZE_SIZE__");
   if (optimize)