[compiler-rt] r330712 - The OpenBSD UBsan port introduced two typos that broke the Solaris sanitizer build.

[Rainer Orth via llvm-commits]

Author: ro
Date: Tue Apr 24 06:00:24 2018
New Revision: 330712

URL: http://llvm.org/viewvc/llvm-project?rev=330712&view=rev
Log:
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

Modified:
    compiler-rt/trunk/lib/interception/interception.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h

Modified: compiler-rt/trunk/lib/interception/interception.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception.h?rev=330712&r1=330711&r2=330712&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception.h (original)
+++ compiler-rt/trunk/lib/interception/interception.h Tue Apr 24 06:00:24 2018
@@ -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
 

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h?rev=330712&r1=330711&r2=330712&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h Tue Apr 24 06:00:24 2018
@@ -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