diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-05-29 12:18:18 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2012-05-29 12:18:18 +0000 |
| commit | b3cedf98a3c8545da2234c2d35cb5d687984035f (patch) | |
| tree | 5c782c80526bda13c60dc9df0753040c5c4a27a3 /make | |
| parent | ff20f17cd0543bc9d4112831574b9bb6a0f21fc6 (diff) | |
| download | compiler-rt-b3cedf98a3c8545da2234c2d35cb5d687984035f.tar.gz compiler-rt-b3cedf98a3c8545da2234c2d35cb5d687984035f.tar.bz2 compiler-rt-b3cedf98a3c8545da2234c2d35cb5d687984035f.tar.xz | |
[asan,tsan] Add a new directory compiler-rt/lib/sanitizer_common
which will contain code shared between asan and tsan run-times.
Naming is hard. If you can suggest a better name for the directory -- speak up.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157611 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
| -rw-r--r-- | make/platform/clang_darwin.mk | 3 | ||||
| -rw-r--r-- | make/platform/clang_linux.mk | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index 472592e1..96fc942e 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -144,7 +144,8 @@ FUNCTIONS.osx := mulosi4 mulodi4 muloti4 FUNCTIONS.profile_osx := GCDAProfiling FUNCTIONS.profile_ios := GCDAProfiling -FUNCTIONS.asan_osx := $(AsanFunctions) $(InterceptionFunctions) +FUNCTIONS.asan_osx := $(AsanFunctions) $(InterceptionFunctions) \ + $(SanitizerCommonFunctions) CCKEXT_COMMON_FUNCTIONS := \ absvdi2 \ diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk index 261edf0e..f2b049f8 100644 --- a/make/platform/clang_linux.mk +++ b/make/platform/clang_linux.mk @@ -79,9 +79,12 @@ 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) $(InterceptionFunctions) -FUNCTIONS.asan-x86_64 := $(AsanFunctions) $(InterceptionFunctions) -FUNCTIONS.tsan-x86_64 := $(TsanFunctions) $(InterceptionFunctions) +FUNCTIONS.asan-i386 := $(AsanFunctions) $(InterceptionFunctions) \ + $(SanitizerCommonFunctions) +FUNCTIONS.asan-x86_64 := $(AsanFunctions) $(InterceptionFunctions) \ + $(SanitizerCommonFunctions) +FUNCTIONS.tsan-x86_64 := $(TsanFunctions) $(InterceptionFunctions) \ + $(SanitizerCommonFunctions) # Always use optimized variants. OPTIMIZED := 1 |