diff options
author | Alexey Samsonov <samsonov@google.com> | 2014-05-12 18:39:51 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2014-05-12 18:39:51 +0000 |
commit | 161a85d8786d2394a6a7cd84385f5a40043d26eb (patch) | |
tree | 1ead6ef101994952e0bf6b2f42e716bae644de7e /runtime | |
parent | 2b84dd3d77a6f9ac9cc06bf9685ac8ebcf4ecfe6 (diff) |
[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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/compiler-rt/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index b683fcdc8b..24efdf45b5 100644 --- a/runtime/compiler-rt/Makefile +++ b/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. |