[llvm-commits] [compiler-rt] r145648 - in /compiler-rt/trunk/lib: Makefile.mk asan/Makefile.mk asan/mach_override/Makefile.mk asan/sysinfo/Makefile.mk

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 17:35:56 2011
New Revision: 145648

URL: http://llvm.org/viewvc/llvm-project?rev=145648&view=rev
Log:
asan: Fill in integration with compiler-rt/make build.

Added:
    compiler-rt/trunk/lib/asan/mach_override/Makefile.mk
      - copied, changed from r145647, compiler-rt/trunk/lib/Makefile.mk
    compiler-rt/trunk/lib/asan/sysinfo/Makefile.mk
      - copied, changed from r145647, compiler-rt/trunk/lib/Makefile.mk
Modified:
    compiler-rt/trunk/lib/Makefile.mk
    compiler-rt/trunk/lib/asan/Makefile.mk

Modified: compiler-rt/trunk/lib/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/Makefile.mk?rev=145648&r1=145647&r2=145648&view=diff
==============================================================================
--- compiler-rt/trunk/lib/Makefile.mk (original)
+++ compiler-rt/trunk/lib/Makefile.mk Thu Dec  1 17:35:56 2011
@@ -13,6 +13,7 @@
 SubDirs += i386 ppc x86_64 arm
 
 # Add other submodules.
+SubDirs += asan
 SubDirs += profile
 
 # Define the variables for this specific directory.

Modified: compiler-rt/trunk/lib/asan/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=145648&r1=145647&r2=145648&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/Makefile.mk Thu Dec  1 17:35:56 2011
@@ -7,4 +7,15 @@
 #
 #===------------------------------------------------------------------------===#
 
-# See README.txt
+SubDirs := mach_override sysinfo
+
+Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
+ObjNames := $(Sources:%.cc=%.o)
+
+Implementation := Generic
+
+# FIXME: use automatic dependencies?
+Dependencies := $(wildcard $(Dir)/*.h)
+
+# Define a convenience variable for all the asan functions.
+AsanFunctions := $(Sources:%.cc=%)

Copied: compiler-rt/trunk/lib/asan/mach_override/Makefile.mk (from r145647, compiler-rt/trunk/lib/Makefile.mk)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/mach_override/Makefile.mk?p2=compiler-rt/trunk/lib/asan/mach_override/Makefile.mk&p1=compiler-rt/trunk/lib/Makefile.mk&r1=145647&r2=145648&rev=145648&view=diff
==============================================================================
--- compiler-rt/trunk/lib/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/mach_override/Makefile.mk Thu Dec  1 17:35:56 2011
@@ -1,4 +1,4 @@
-#===- lib/Makefile.mk --------------------------------------*- Makefile -*--===#
+#===- lib/asan/mach_override/Makefile.mk -------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -9,16 +9,13 @@
 
 SubDirs :=
 
-# Add arch specific optimized implementations.
-SubDirs += i386 ppc x86_64 arm
-
-# Add other submodules.
-SubDirs += profile
-
-# Define the variables for this specific directory.
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o)
+
 Implementation := Generic
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
+
+# Define a convenience variable for all the asan functions.
+AsanFunctions += $(Sources:%.c=%)

Copied: compiler-rt/trunk/lib/asan/sysinfo/Makefile.mk (from r145647, compiler-rt/trunk/lib/Makefile.mk)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/sysinfo/Makefile.mk?p2=compiler-rt/trunk/lib/asan/sysinfo/Makefile.mk&p1=compiler-rt/trunk/lib/Makefile.mk&r1=145647&r2=145648&rev=145648&view=diff
==============================================================================
--- compiler-rt/trunk/lib/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/sysinfo/Makefile.mk Thu Dec  1 17:35:56 2011
@@ -1,4 +1,4 @@
-#===- lib/Makefile.mk --------------------------------------*- Makefile -*--===#
+#===- lib/asan/sysinfo/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -9,16 +9,13 @@
 
 SubDirs :=
 
-# Add arch specific optimized implementations.
-SubDirs += i386 ppc x86_64 arm
-
-# Add other submodules.
-SubDirs += profile
-
-# Define the variables for this specific directory.
-Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
+Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o)
+
 Implementation := Generic
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
+
+# Define a convenience variable for all the asan functions.
+AsanFunctions += $(Sources:%.cc=%)