diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2018-03-16 22:29:29 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2018-03-16 22:29:29 +0000 |
| commit | 37e599c1fe0403f3c89e1755daa8e58401ddba0a (patch) | |
| tree | 750330494350c76a12b86a6049204d4f3e585952 | |
| parent | 5fe72ccbb2c5733e929b146e23ba7c5aa16faab5 (diff) | |
OpenBSD UBsan support final missing bits
Summary:
One forgotten file change + reordering one header due to clang-format
Patch by David CARLIER
Reviewers: vitalybuka, vsk
Subscribers: kubamracek, fedor.sergeev, llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D44556
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@327758 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux.h | 8 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_procmaps_bsd.cc | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.h b/lib/sanitizer_common/sanitizer_linux.h index 2d227f82a..e005af94d 100644 --- a/lib/sanitizer_common/sanitizer_linux.h +++ b/lib/sanitizer_common/sanitizer_linux.h @@ -14,11 +14,12 @@ #define SANITIZER_LINUX_H #include "sanitizer_platform.h" -#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \ - SANITIZER_SOLARIS +#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \ + SANITIZER_OPENBSD || SANITIZER_SOLARIS #include "sanitizer_common.h" #include "sanitizer_internal_defs.h" #include "sanitizer_platform_limits_netbsd.h" +#include "sanitizer_platform_limits_openbsd.h" #include "sanitizer_platform_limits_posix.h" #include "sanitizer_platform_limits_solaris.h" #include "sanitizer_posix.h" @@ -145,6 +146,5 @@ ALWAYS_INLINE uptr *get_android_tls_ptr() { } // namespace __sanitizer -#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || - // SANITIZER_SOLARIS +#endif #endif // SANITIZER_LINUX_H diff --git a/lib/sanitizer_common/sanitizer_procmaps_bsd.cc b/lib/sanitizer_common/sanitizer_procmaps_bsd.cc index 173342fe8..e41dc987d 100644 --- a/lib/sanitizer_common/sanitizer_procmaps_bsd.cc +++ b/lib/sanitizer_common/sanitizer_procmaps_bsd.cc @@ -19,8 +19,10 @@ #endif #include "sanitizer_procmaps.h" -#include <sys/sysctl.h> +// clang-format off #include <sys/types.h> +#include <sys/sysctl.h> +// clang-format on #include <unistd.h> #if SANITIZER_FREEBSD #include <sys/user.h> |