diff options
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc | 3 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h | 2 | ||||
| -rw-r--r-- | compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cc (renamed from compiler-rt/test/sanitizer_common/TestCases/NetBSD/vis.cc) | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index 8d77109941b..82224e0fb0b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -543,6 +543,6 @@ #define SANITIZER_INTERCEPT_MD2 SI_NETBSD #define SANITIZER_INTERCEPT_SHA2 SI_NETBSD #define SANITIZER_INTERCEPT_CDB SI_NETBSD -#define SANITIZER_INTERCEPT_VIS SI_NETBSD +#define SANITIZER_INTERCEPT_VIS (SI_NETBSD || SI_FREEBSD) #endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc index cebb216ecd9..3eaa695ae16 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cc @@ -65,6 +65,7 @@ #include <term.h> #include <utmpx.h> #include <wchar.h> +#include <vis.h> #define _KERNEL // to declare 'shminfo' structure # include <sys/shm.h> @@ -338,6 +339,8 @@ namespace __sanitizer { const int si_SEGV_MAPERR = SEGV_MAPERR; const int si_SEGV_ACCERR = SEGV_ACCERR; + const int unvis_valid = UNVIS_VALID; + const int unvis_validpush = UNVIS_VALIDPUSH; } // namespace __sanitizer using namespace __sanitizer; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h index 90329acb37a..b212c005c74 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h @@ -62,6 +62,8 @@ namespace __sanitizer { extern unsigned struct_rlimit_sz; extern unsigned struct_utimbuf_sz; extern unsigned struct_timespec_sz; + extern const int unvis_valid; + extern const int unvis_validpush; struct __sanitizer_iocb { u64 aio_data; diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/vis.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cc index 89ea259e59e..15f1bc94902 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/vis.cc +++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cc @@ -1,4 +1,6 @@ // RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s +// +// UNSUPPORTED: linux, solaris, darwin #include <ctype.h> #include <err.h> |
