[Sanitizers] Fix Solaris build

[ro]

Summary

The OpenBSD UBsan port introduced two typos that broke the Solaris sanitizer build.
The following patch restores it, will shortly commit as obvious.

[krytarowski]

Can you run tests on SunOS? check-asan, check-ubsan etc.

[ro]

In D46006#1076822, @krytarowski wrote:

Can you run tests on SunOS? check-asan, check-ubsan etc.

Of course: that's the first thing I did after fixing the build (run make check-all, that is, which includes the above). Same as before the
breakage.

[krytarowski]

In D46006#1077941, @ro wrote:

In D46006#1076822, @krytarowski wrote:

Can you run tests on SunOS? check-asan, check-ubsan etc.

Of course: that's the first thing I did after fixing the build (run make check-all, that is, which includes the above). Same as before the
breakage.

What are the SunOS results? For NetBSD ASan broke badly and results for other sanitizers (UBSan, TSan, MSan) are deteriorated...

I will need to fix it in future again.

[ro]

In D46006#1078139, @krytarowski wrote:

What are the SunOS results? For NetBSD ASan broke badly and results for other sanitizers (UBSan, TSan, MSan) are deteriorated...

Failing Tests (23):

  LLVM-Unit :: Support/./SupportTests/FileSystemTest.permissions
  AddressSanitizer-i386-sunos :: TestCases/init-order-atexit.cc
  AddressSanitizer-i386-sunos :: TestCases/intercept-rethrow-exception.cc
  AddressSanitizer-i386-sunos :: TestCases/log-path_test.cc
  AddressSanitizer-i386-sunos :: TestCases/malloc-no-intercept.c
  AddressSanitizer-i386-sunos-dynamic :: TestCases/Posix/start-deactivated.cc
  AddressSanitizer-i386-sunos-dynamic :: TestCases/default_options.cc
  AddressSanitizer-i386-sunos-dynamic :: TestCases/init-order-atexit.cc
  AddressSanitizer-i386-sunos-dynamic :: TestCases/intercept-rethrow-exception.cc
  AddressSanitizer-i386-sunos-dynamic :: TestCases/log-path_test.cc
  AddressSanitizer-i386-sunos-dynamic :: TestCases/malloc-no-intercept.c
  Builtins-i386-sunos :: divsc3_test.c
  Clang :: Driver/baremetal.cpp
  Clang :: Driver/cl-response-file.c
  Clang :: Driver/fuchsia.c
  Clang :: Driver/fuchsia.cpp
  Clang :: Driver/wasm-toolchain.c
  Clang :: Driver/wasm-toolchain.cpp
  Clang :: Sema/wchar.c
  SanitizerCommon-Unit :: ./Sanitizer-i386-Test/MemoryMappingLayout.DumpListOfModules
  SanitizerCommon-Unit :: ./Sanitizer-i386-Test/SanitizerCommon.PthreadDestructorIterations
  SanitizerCommon-Unit :: ./Sanitizer-x86_64-Test/MemoryMappingLayout.DumpListOfModules
  SanitizerCommon-Unit :: ./Sanitizer-x86_64-Test/SanitizerCommon.PthreadDestructorIterations

Expected Passes    : 28406
Expected Failures  : 73
Unsupported Tests  : 11365
Unexpected Failures: 23

I've already analysed some of them, but got distracted by vacation and the GCC 8 release.

[krytarowski]

Not bad. It looks like FreeBSD ASan broke too... https://bugs.llvm.org/show_bug.cgi?id=37238

I'm currently distracted by kernel bugfixes for debuggers (and porting LLDB) so this will wait a bit unless someone other will step in earlier.

lib/interception/interception.h

 
 #ifndef INTERCEPTION_H
 #define INTERCEPTION_H
 
 #include "sanitizer_common/sanitizer_internal_defs.h"
 
 #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
 
 // These typedefs should be used only in the interceptor definitions to replace
 // the standard system types (e.g. SSIZE_T instead of ssize_t)
 typedef __sanitizer::uptr    SIZE_T;
 typedef __sanitizer::sptr    SSIZE_T;
 typedef __sanitizer::sptr    PTRDIFF_T;

lib/sanitizer_common/sanitizer_platform.h

 // Common platform macros.
 //===----------------------------------------------------------------------===//
 
 #ifndef SANITIZER_PLATFORM_H
 #define SANITIZER_PLATFORM_H
 
 #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
 
 #if defined(__linux__)
 # define SANITIZER_LINUX   1
 #else
 # define SANITIZER_LINUX   0
 #endif