[llvm-commits] [compiler-rt] r156816 - in /compiler-rt/trunk: LICENSE.TXT lib/Makefile.mk lib/asan/Makefile.mk lib/asan/interception/ lib/interception/ lib/interception/Makefile.mk lib/interception/mach_override/Makefile.mk make/config.mk make/platform/clang_darwin.mk make/platform/clang_linux.mk

Kostya Serebryany kcc at google.com
Tue May 15 05:21:33 PDT 2012 

Author: kcc
Date: Tue May 15 07:21:33 2012
New Revision: 156816

URL: http://llvm.org/viewvc/llvm-project?rev=156816&view=rev
Log:
[asan] move lib/asan/interception to lib/interception so that other tools (e.g. tsan) can use it

Added:
    compiler-rt/trunk/lib/interception/
      - copied from r156813, compiler-rt/trunk/lib/asan/interception/
Removed:
    compiler-rt/trunk/lib/asan/interception/
Modified:
    compiler-rt/trunk/LICENSE.TXT
    compiler-rt/trunk/lib/Makefile.mk
    compiler-rt/trunk/lib/asan/Makefile.mk
    compiler-rt/trunk/lib/interception/Makefile.mk
    compiler-rt/trunk/lib/interception/mach_override/Makefile.mk
    compiler-rt/trunk/make/config.mk
    compiler-rt/trunk/make/platform/clang_darwin.mk
    compiler-rt/trunk/make/platform/clang_linux.mk

Modified: compiler-rt/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/LICENSE.TXT?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/LICENSE.TXT (original)
+++ compiler-rt/trunk/LICENSE.TXT Tue May 15 07:21:33 2012
@@ -94,4 +94,4 @@
 
 Program             Directory
 -------             ---------
-mach_override       lib/asan/interception/mach_override
+mach_override       lib/interception/mach_override

Modified: compiler-rt/trunk/lib/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/Makefile.mk?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/lib/Makefile.mk (original)
+++ compiler-rt/trunk/lib/Makefile.mk Tue May 15 07:21:33 2012
@@ -15,6 +15,7 @@
 
 # Add other submodules.
 SubDirs += asan
+SubDirs += interception
 SubDirs += profile
 
 # FIXME: We don't currently support building an atomic library, and as it must

Modified: compiler-rt/trunk/lib/asan/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/Makefile.mk Tue May 15 07:21:33 2012
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := asan
-SubDirs := interception
+SubDirs :=
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.cc=%.o)

Modified: compiler-rt/trunk/lib/interception/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/Makefile.mk?rev=156816&r1=156813&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/Makefile.mk (original)
+++ compiler-rt/trunk/lib/interception/Makefile.mk Tue May 15 07:21:33 2012
@@ -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 @@
 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=%)

Modified: compiler-rt/trunk/lib/interception/mach_override/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/mach_override/Makefile.mk?rev=156816&r1=156813&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/mach_override/Makefile.mk (original)
+++ compiler-rt/trunk/lib/interception/mach_override/Makefile.mk Tue May 15 07:21:33 2012
@@ -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 @@
 # 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=%)

Modified: compiler-rt/trunk/make/config.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/config.mk?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/make/config.mk (original)
+++ compiler-rt/trunk/make/config.mk Tue May 15 07:21:33 2012
@@ -42,5 +42,5 @@
 
 ###
 # Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables
+COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib
 COMMON_CFLAGS=-fPIC

Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Tue May 15 07:21:33 2012
@@ -144,7 +144,7 @@
 FUNCTIONS.profile_osx := GCDAProfiling
 FUNCTIONS.profile_ios := GCDAProfiling
 
-FUNCTIONS.asan_osx := $(AsanFunctions)
+FUNCTIONS.asan_osx := $(AsanFunctions) $(InterceptionFunctions)
 
 CCKEXT_COMMON_FUNCTIONS := \
 	absvdi2 \

Modified: compiler-rt/trunk/make/platform/clang_linux.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=156816&r1=156815&r2=156816&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_linux.mk (original)
+++ compiler-rt/trunk/make/platform/clang_linux.mk Tue May 15 07:21:33 2012
@@ -72,8 +72,8 @@
 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

More information about the llvm-commits mailing list