summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorRainer Orth <ro@gcc.gnu.org>2018-04-24 13:00:24 +0000
committerRainer Orth <ro@gcc.gnu.org>2018-04-24 13:00:24 +0000
commit482cef6c3dd525540f3e59df7f10962dc6e62805 (patch)
treea73eecaaf3993c762cadfb9722bc5c0637be8b8c /compiler-rt
parent5717fbaf4c4c259ffe058e4e2d2c89a1b501b3e0 (diff)
downloadbcm5719-llvm-482cef6c3dd525540f3e59df7f10962dc6e62805.tar.gz
bcm5719-llvm-482cef6c3dd525540f3e59df7f10962dc6e62805.zip
The OpenBSD UBsan port introduced two typos that broke the Solaris sanitizer build.
The following patch restores it, will shortly commit as obvious. Differential Revision: https://reviews.llvm.org/D46006 llvm-svn: 330712
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/interception/interception.h2
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/interception/interception.h b/compiler-rt/lib/interception/interception.h
index 778490b8bac..37d56e8ccdf 100644
--- a/compiler-rt/lib/interception/interception.h
+++ b/compiler-rt/lib/interception/interception.h
@@ -19,7 +19,7 @@
#if !SANITIZER_LINUX && !SANITIZER_FREEBSD && !SANITIZER_MAC && \
!SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_WINDOWS && \
- !SANITIZER_FUCHSIA && SANITIZER_SOLARIS
+ !SANITIZER_FUCHSIA && !SANITIZER_SOLARIS
# error "Interception doesn't work on this operating system."
#endif
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 2fec13f3580..1eec2971a73 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -15,7 +15,7 @@
#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
!defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \
- !defined(__Fuchsia__) && !(defined(__sun__) && defined(__srv4__))
+ !defined(__Fuchsia__) && !(defined(__sun__) && defined(__svr4__))
# error "This operating system is not supported"
#endif
OpenPOWER on IntegriCloud