[ASan] Only define macros in asan_init_version.h, move the __asan_init declaration back to asan_interface_internal.h

This fixes the issues we've uncovered after landing r212815.

Reviewed at http://reviews.llvm.org/D4500

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@213053 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/asan/asan_init_version.h b/lib/asan/asan_init_version.h
index 88eb80fed..77aea81bd 100644
--- a/lib/asan/asan_init_version.h
+++ b/lib/asan/asan_init_version.h
@@ -15,21 +15,16 @@
 #ifndef ASAN_INIT_VERSION_H
 #define ASAN_INIT_VERSION_H
 
-#include "sanitizer_common/sanitizer_internal_defs.h"
-
 extern "C" {
-  // This function should be called at the very beginning of the process,
-  // before any instrumented code is executed and before any call to malloc.
-  // Every time the ASan ABI changes we also change the version number in this
-  // name. Objects build with incompatible ASan ABI version
-  // will not link with run-time.
+  // Every time the ASan ABI changes we also change the version number in the
+  // __asan_init function name.  Objects built with incompatible ASan ABI
+  // versions will not link with run-time.
   // Changes between ABI versions:
   // v1=>v2: added 'module_name' to __asan_global
   // v2=>v3: stack frame description (created by the compiler)
   //         contains the function PC as the 3-rd field (see
   //         DescribeAddressIfStack).
   // v3=>v4: added '__asan_global_source_location' to __asan_global.
-  SANITIZER_INTERFACE_ATTRIBUTE void __asan_init_v4();
   #define __asan_init __asan_init_v4
   #define __asan_init_name "__asan_init_v4"
 }