[asan] move lib/asan/interception to lib/interception so that other tools (e.g. tsan) can use it

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

19 files changed, 15 insertions, 14 deletions

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 14925ca7e..f71794256 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -94,4 +94,4 @@ licenses, and/or restrictions:
 
 Program             Directory
 -------             ---------
-mach_override       lib/asan/interception/mach_override
+mach_override       lib/interception/mach_override
diff --git a/lib/Makefile.mk b/lib/Makefile.mk
index 37aaa9c46..6d88013d0 100644
--- a/lib/Makefile.mk
+++ b/lib/Makefile.mk
@@ -15,6 +15,7 @@ SubDirs += i386 ppc x86_64 arm
 
 # Add other submodules.
 SubDirs += asan
+SubDirs += interception
 SubDirs += profile
 
 # FIXME: We don't currently support building an atomic library, and as it must
diff --git a/lib/asan/Makefile.mk b/lib/asan/Makefile.mk
index 392d62118..9d1a2e8a9 100644
--- a/lib/asan/Makefile.mk
+++ b/lib/asan/Makefile.mk
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := asan
-SubDirs := interception
+SubDirs :=
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.cc=%.o)
diff --git a/lib/asan/interception/Makefile.mk b/lib/interception/Makefile.mk
index 3fb7778fb..1412a016f 100644
--- a/lib/asan/interception/Makefile.mk
+++ b/lib/interception/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/asan/interception/Makefile.mk --------------------*- Makefile -*--===#
+#===- lib/interception/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,7 +7,7 @@
 #
 #===------------------------------------------------------------------------===#
 
-ModuleName := asan
+ModuleName := interception
 SubDirs := mach_override
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
@@ -19,5 +19,5 @@ Implementation := Generic
 Dependencies := $(wildcard $(Dir)/*.h)
 Dependencies += $(wildcard $(Dir)/mach_override/*.h)
 
-# Define a convenience variable for all the asan functions.
-AsanFunctions += $(Sources:%.cc=%)
+# Define a convenience variable for all the interception functions.
+InterceptionFunctions := $(Sources:%.cc=%)
diff --git a/lib/asan/interception/interception.h b/lib/interception/interception.h
index fb3eef08a..fb3eef08a 100644
--- a/lib/asan/interception/interception.h
+++ b/lib/interception/interception.h
diff --git a/lib/asan/interception/interception_linux.cc b/lib/interception/interception_linux.cc
index 74fcf563f..74fcf563f 100644
--- a/lib/asan/interception/interception_linux.cc
+++ b/lib/interception/interception_linux.cc
diff --git a/lib/asan/interception/interception_linux.h b/lib/interception/interception_linux.h
index 102b3c190..102b3c190 100644
--- a/lib/asan/interception/interception_linux.h
+++ b/lib/interception/interception_linux.h
diff --git a/lib/asan/interception/interception_mac.cc b/lib/interception/interception_mac.cc
index cc9e4a70d..cc9e4a70d 100644
--- a/lib/asan/interception/interception_mac.cc
+++ b/lib/interception/interception_mac.cc
diff --git a/lib/asan/interception/interception_mac.h b/lib/interception/interception_mac.h
index 224d961ee..224d961ee 100644
--- a/lib/asan/interception/interception_mac.h
+++ b/lib/interception/interception_mac.h
diff --git a/lib/asan/interception/interception_win.cc b/lib/interception/interception_win.cc
index a60c741cb..a60c741cb 100644
--- a/lib/asan/interception/interception_win.cc
+++ b/lib/interception/interception_win.cc
diff --git a/lib/asan/interception/interception_win.h b/lib/interception/interception_win.h
index 9d1586ecb..9d1586ecb 100644
--- a/lib/asan/interception/interception_win.h
+++ b/lib/interception/interception_win.h
diff --git a/lib/asan/interception/mach_override/LICENSE.TXT b/lib/interception/mach_override/LICENSE.TXT
index 944696517..944696517 100644
--- a/lib/asan/interception/mach_override/LICENSE.TXT
+++ b/lib/interception/mach_override/LICENSE.TXT
diff --git a/lib/asan/interception/mach_override/Makefile.mk b/lib/interception/mach_override/Makefile.mk
index 78be0b383..8f5ebdab1 100644
--- a/lib/asan/interception/mach_override/Makefile.mk
+++ b/lib/interception/mach_override/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/asan/mach_override/Makefile.mk -------------------*- Makefile -*--===#
+#===- lib/interception/mach_override/Makefile.mk -----------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,7 +7,7 @@
 #
 #===------------------------------------------------------------------------===#
 
-ModuleName := asan
+ModuleName := interception
 SubDirs :=
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
@@ -18,5 +18,5 @@ Implementation := Generic
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
 
-# Define a convenience variable for all the asan functions.
-AsanFunctions += $(Sources:%.c=%)
+# Define a convenience variable for all the interception functions.
+InterceptionFunctions += $(Sources:%.c=%)
diff --git a/lib/asan/interception/mach_override/README.txt b/lib/interception/mach_override/README.txt
index 5f62ad7b9..5f62ad7b9 100644
--- a/lib/asan/interception/mach_override/README.txt
+++ b/lib/interception/mach_override/README.txt
diff --git a/lib/asan/interception/mach_override/mach_override.c b/lib/interception/mach_override/mach_override.c
index 399f82d75..399f82d75 100644
--- a/lib/asan/interception/mach_override/mach_override.c
+++ b/lib/interception/mach_override/mach_override.c
diff --git a/lib/asan/interception/mach_override/mach_override.h b/lib/interception/mach_override/mach_override.h
index 7e60cdcd6..7e60cdcd6 100644
--- a/lib/asan/interception/mach_override/mach_override.h
+++ b/lib/interception/mach_override/mach_override.h
diff --git a/make/config.mk b/make/config.mk
index a82617387..42fb9a876 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -42,5 +42,5 @@ endif
 
 ###
 # Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables
+COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib
 COMMON_CFLAGS=-fPIC
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 2ca5fbc79..d0c68e038 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -144,7 +144,7 @@ FUNCTIONS.osx	:= mulosi4 mulodi4 muloti4
 FUNCTIONS.profile_osx := GCDAProfiling
 FUNCTIONS.profile_ios := GCDAProfiling
 
-FUNCTIONS.asan_osx := $(AsanFunctions)
+FUNCTIONS.asan_osx := $(AsanFunctions) $(InterceptionFunctions)
 
 CCKEXT_COMMON_FUNCTIONS := \
 	absvdi2 \
diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk
index b3a77593a..3c799ef10 100644
--- a/make/platform/clang_linux.mk
+++ b/make/platform/clang_linux.mk
@@ -72,8 +72,8 @@ FUNCTIONS.full-i386 := $(CommonFunctions) $(ArchFunctions.i386)
 FUNCTIONS.full-x86_64 := $(CommonFunctions) $(ArchFunctions.x86_64)
 FUNCTIONS.profile-i386 := GCDAProfiling
 FUNCTIONS.profile-x86_64 := GCDAProfiling
-FUNCTIONS.asan-i386 := $(AsanFunctions)
-FUNCTIONS.asan-x86_64 := $(AsanFunctions)
+FUNCTIONS.asan-i386 := $(AsanFunctions) $(InterceptionFunctions)
+FUNCTIONS.asan-x86_64 := $(AsanFunctions) $(InterceptionFunctions)
 
 # Always use optimized variants.
 OPTIMIZED := 1