From c087df065577f8ca283ef36e5bab13d04821fe19 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 7 May 2014 08:55:46 +0000 Subject: [PATCH] [asan] Include asm instrumentation source in Makefile build. llvm-svn: 208172 --- compiler-rt/lib/asan/Makefile.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/asan/Makefile.mk b/compiler-rt/lib/asan/Makefile.mk index 97da64bec573..6e8d33540d78 100644 --- a/compiler-rt/lib/asan/Makefile.mk +++ b/compiler-rt/lib/asan/Makefile.mk @@ -10,8 +10,10 @@ ModuleName := asan SubDirs := -Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file))) -ObjNames := $(Sources:%.cc=%.o) +CCSources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file))) +SSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file))) +Sources := $(CCSources) $(SSources) +ObjNames := $(CCSources:%.cc=%.o) $(SSources:%.S=%.o) Implementation := Generic @@ -21,4 +23,4 @@ Dependencies += $(wildcard $(Dir)/../interception/*.h) Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h) # Define a convenience variable for all the asan functions. -AsanFunctions := $(Sources:%.cc=%) +AsanFunctions := $(CCSources:%.cc=%) $(SSources:%.S=%)