diff options
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
| -rw-r--r-- | lib/libclang_rt/Makefile | 3 | ||||
| -rw-r--r-- | lib/libclang_rt/Makefile.inc | 3 | ||||
| -rw-r--r-- | lib/libclang_rt/include/Makefile | 19 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 10 |
5 files changed, 35 insertions, 2 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3fced30..3a00a90 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -21,6 +21,8 @@ clang 3.7.0 include + sanitizer + .. .. lib freebsd diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 18ad0d4..ce86dc1 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -3,7 +3,8 @@ .include <src.opts.mk> .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SUBDIR+= asan\ +SUBDIR+= include\ + asan\ asan-preinit\ asan_cxx\ safestack\ diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index ef381c9..f9bd454 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -5,7 +5,8 @@ CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/} CRTSRC=${.CURDIR}/../../../contrib/compiler-rt -LIBDIR=/usr/lib/clang/3.7.0/lib/freebsd +CLANGDIR=/usr/lib/clang/3.7.0 +LIBDIR=${CLANGDIR}/lib/freebsd NO_PIC= MK_PROFILE=no diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile new file mode 100644 index 0000000..5638d4f --- /dev/null +++ b/lib/libclang_rt/include/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +.include <bsd.init.mk> + +.PATH: ${CRTSRC}/include/sanitizer + +INCSDIR=${CLANGDIR}/include/sanitizer + +INCS= allocator_interface.h\ + asan_interface.h\ + common_interface_defs.h\ + coverage_interface.h\ + dfsan_interface.h\ + linux_syscall_hooks.h\ + lsan_interface.h\ + msan_interface.h\ + tsan_interface_atomic.h + +.include <bsd.prog.mk> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1ef88ff..61f8795 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1048,6 +1048,16 @@ OLD_FILES+=usr/bin/clang++ OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/bin/clang-tblgen OLD_FILES+=usr/bin/tblgen +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h |
