[llvm-commits] [compiler-rt] r150171 - in /compiler-rt/trunk/lib/asan: Makefile.mk Makefile.old interception/Makefile.mk interception/interception_mac.cc interception/mach_override/ mach_override/

[Alexey Samsonov]

Author: samsonov
Date: Thu Feb  9 05:36:12 2012
New Revision: 150171

URL: http://llvm.org/viewvc/llvm-project?rev=150171&view=rev
Log:
AddressSanitizer: move mach_override inside interception library

Added:
    compiler-rt/trunk/lib/asan/interception/mach_override/
      - copied from r150169, compiler-rt/trunk/lib/asan/mach_override/
Removed:
    compiler-rt/trunk/lib/asan/mach_override/
Modified:
    compiler-rt/trunk/lib/asan/Makefile.mk
    compiler-rt/trunk/lib/asan/Makefile.old
    compiler-rt/trunk/lib/asan/interception/Makefile.mk
    compiler-rt/trunk/lib/asan/interception/interception_mac.cc

Modified: compiler-rt/trunk/lib/asan/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=150171&r1=150170&r2=150171&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/Makefile.mk Thu Feb  9 05:36:12 2012
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := asan
-SubDirs := interception mach_override
+SubDirs := interception
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.cc=%.o)
@@ -18,7 +18,7 @@
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
 Dependencies += $(wildcard $(Dir)/interception/*.h)
-Dependencies += $(wildcard $(Dir)/mach_override/*.h)
+Dependencies += $(wildcard $(Dir)/interception/mach_override/*.h)
 
 # Define a convenience variable for all the asan functions.
 AsanFunctions := $(Sources:%.cc=%)

Modified: compiler-rt/trunk/lib/asan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=150171&r1=150170&r2=150171&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.old (original)
+++ compiler-rt/trunk/lib/asan/Makefile.old Thu Feb  9 05:36:12 2012
@@ -181,7 +181,7 @@
 	interception/interception.h \
 	interception/interception_linux.h \
 	interception/interception_mac.h \
-	mach_override/mach_override.h
+	interception/mach_override/mach_override.h
 
 LIBASAN_OBJ=$(BIN)/asan_rtl$(SUFF).o \
 	    $(BIN)/asan_allocator$(SUFF).o  \
@@ -200,7 +200,7 @@
 	    $(BIN)/asan_thread_registry$(SUFF).o  \
 	    $(BIN)/interception/interception_linux$(SUFF).o  \
 	    $(BIN)/interception/interception_mac$(SUFF).o  \
-	    $(BIN)/mach_override/mach_override$(SUFF).o
+	    $(BIN)/interception/mach_override/mach_override$(SUFF).o
 
 GTEST_ROOT=third_party/googletest
 GTEST_INCLUDE=-I$(GTEST_ROOT)/include
@@ -233,7 +233,7 @@
 mk_bin_dir:
 	mkdir -p $(BIN)
 	mkdir -p $(BIN)/interception
-	mkdir -p $(BIN)/mach_override
+	mkdir -p $(BIN)/interception/mach_override
 
 clang:
 	cd ../ && llvm/rebuild_clang_and_asan.sh > /dev/null

Modified: compiler-rt/trunk/lib/asan/interception/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/interception/Makefile.mk?rev=150171&r1=150170&r2=150171&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/interception/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/interception/Makefile.mk Thu Feb  9 05:36:12 2012
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := asan
-SubDirs :=
+SubDirs := mach_override
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.cc=%.o)
@@ -17,6 +17,7 @@
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies += $(wildcard $(Dir)/mach_override/*.h)
 
 # Define a convenience variable for all the asan functions.
 AsanFunctions += $(Sources:%.cc=%)

Modified: compiler-rt/trunk/lib/asan/interception/interception_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/interception/interception_mac.cc?rev=150171&r1=150170&r2=150171&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/interception/interception_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/interception/interception_mac.cc Thu Feb  9 05:36:12 2012
@@ -17,8 +17,7 @@
 #define INCLUDED_FROM_INTERCEPTION_LIB
 #include "interception_mac.h"
 #undef INCLUDED_FROM_INTERCEPTION_LIB
-// FIXME(samsonov): Put mach_override/ under interception/
-#include "../mach_override/mach_override.h"
+#include "mach_override/mach_override.h"
 
 namespace __interception {
 bool OverrideFunction(void *old_func, void *new_func, void **orig_old_func) {