From b01f936ffe14b79580dd164e04bddb23353a2ecb Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Mon, 12 May 2014 18:39:51 +0000 Subject: [ASan] Split static ASan runtime in two parts: asan and asan_cxx. asan_cxx containts replacements for new/delete operators, and should only be linked in C++ mode. We plan to start building this part with exception support to make new more standard-compliant. See https://code.google.com/p/address-sanitizer/issues/detail?id=295 for more details. llvm-svn: 208610 --- clang/runtime/compiler-rt/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/runtime') diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index b683fcdc8b9..24efdf45b5a 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/runtime/compiler-rt/Makefile @@ -126,8 +126,8 @@ TryCompile = \ # We try to build 32-bit runtimes both on 32-bit hosts and 64-bit hosts. Runtime32BitConfigs = \ - full-i386.a profile-i386.a san-i386.a asan-i386.a ubsan-i386.a \ - ubsan_cxx-i386.a + full-i386.a profile-i386.a san-i386.a asan-i386.a asan_cxx-i386.a \ + ubsan-i386.a ubsan_cxx-i386.a # We currently only try to generate runtime libraries on x86. ifeq ($(ARCH),x86) @@ -137,8 +137,8 @@ endif ifeq ($(ARCH),x86_64) RuntimeLibrary.linux.Configs += \ full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \ - tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a ubsan_cxx-x86_64.a \ - dfsan-x86_64.a lsan-x86_64.a + asan_cxx-x86_64.a tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a \ + ubsan_cxx-x86_64.a dfsan-x86_64.a lsan-x86_64.a # We need to build 32-bit ASan/UBsan libraries on 64-bit platform, and add them # to the list of runtime libraries to make # "clang -fsanitize=(address|undefined) -m32" work. -- cgit v1.2.3