diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2013-04-08 18:45:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2013-04-08 18:45:10 +0000 |
| commit | 809500fc2c13c8173a16b052304d983864e4a1e1 (patch) | |
| tree | 4fc2f184c499d106f29a386c452b49e5197bf63d /runtime | |
| parent | be7c9ec198dcdb5bf73a35bfbb00b3333cb87909 (diff) | |
Notes
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 68b2941f8769e..e946de21a1dcf 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -76,7 +76,8 @@ RuntimeDirs += darwin RuntimeLibrary.darwin.Configs := \ eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \ asan_osx.a asan_osx_dynamic.dylib \ - profile_osx.a profile_ios.a + profile_osx.a profile_ios.a \ + ubsan_osx.a endif # On Linux, include a library which has all the runtime functions. @@ -98,19 +99,23 @@ TryCompile = \ # We currently only try to generate runtime libraries on x86. ifeq ($(ARCH),x86) RuntimeLibrary.linux.Configs += \ - full-i386.a profile-i386.a asan-i386.a + full-i386.a profile-i386.a san-i386.a asan-i386.a ubsan-i386.a \ + ubsan_cxx-i386.a endif ifeq ($(ARCH),x86_64) RuntimeLibrary.linux.Configs += \ - full-x86_64.a profile-x86_64.a asan-x86_64.a tsan-x86_64.a -# We need to build 32-bit ASan library on 64-bit platform, and add it to the -# list of runtime libraries to make "clang -faddress-sanitizer -m32" work. + 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 +# 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. # We check that Clang can produce working 32-bit binaries by compiling a simple # executable. test_source = $(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0) -RuntimeLibrary.linux.Configs += asan-i386.a +RuntimeLibrary.linux.Configs += san-i386.a asan-i386.a ubsan-i386.a \ + ubsan_cxx-i386.a endif ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),) RuntimeLibrary.linux.Configs += asan-arm-android.so |