[Sanitizers, test] Fix sanitizer tests on Solaris (PR 33274)

[ro]

Summary

This patch (on top of the previous two (https://reviews.llvm.org/D40898 and
https://reviews.llvm.org/D40899) complete the compiler-rt side of the the Solaris
sanitizer port.

It contains the following sets of changes:

• For the time being, the port is for 32-bit x86 only, so reject the various tests on x86_64.

• When compiling as C++, <setjmp.h> resp. <iso/setjmp_iso.h> only declares _setjmp and _longjmp inside namespace std.

• MAP_FILE is a Windows feature. While e.g. Linux <sys/mman.h> provides a no-op compat define, Solaris does not.

• test/asan/TestCases/Posix/coverage.cc was initially failing like this:

/vol/gcc/src/llvm/llvm/local/projects/compiler-rt/lib/sanitizer_common/scripts/sancov.py: 4 files merged; 2 PCs total
rm: cannot remove '/var/gcc/llvm/local/projects/compiler-rt/test/asan/I386SunOSConfig/TestCases/Posix/Output/coverage': Invalid argument

Further digging revealed that the rm was trying to remove the running test's working
directory which failed as observed.  cd'ing out of the dir before let the test pass.

• Two tests needed a declaration of alloca. I've now copied the existing code from test/asan/TestCases/alloca_constant_size.cc, but it may be more profitable and maintainable to have a common testsuite header where such code is collected.

• Similarly, Solaris' printf %p format doesn't include the leading 0x.

• In test/asan/TestCases/malloc-no-intercept.c, I had to undef EXTENSIONS (predefined by clang for no apparent reason) to avoid conflicting declarations for memalign.

• test/ubsan/TestCases/Float/cast-overflow.cpp has different platform dependent ways to define BYTE_ORDER and friends. Why not just use BYTE_ORDER and friends as predefined by clang and gcc?

[krytarowski]

test/asan/TestCases/Posix/ioctl.cc

13

Do we need to check for __svr4__? Are there other alive SunOS systems?

test/asan/TestCases/alloca_loop_unpoisoning.cc

17

<stdlib.h> is included above.

test/asan/TestCases/alloca_vla_interact.cc

17

<stdlib.h> is already included

test/asan/TestCases/debug_double_free.cc

20

Is there an option to use %#p?

[ro]

test/asan/TestCases/Posix/ioctl.cc

13

It's still the customary way to check for Solaris and derivatives,
though you'll be hard pressed to find a SunOS 4 system around.

test/asan/TestCases/alloca_loop_unpoisoning.cc

17

Missed that, thanks. We can either change the section to

#elif defined(FreeBSD) || defined(NetBSD)
-#include <stdlib.h>
+// alloca is declared in <stdlib.h>.
#else
#include <alloca.h>

since the BSDs lack <alloca.h> or add a specific guard
for alloca.h inclusion.

My general point about moving such code to a common
test header to avoid duplication in several places still stands.

test/asan/TestCases/debug_double_free.cc

20

No: although printf(3C) accepts it, it only adds 0x/0X for the
%x and %X formats, not %p.

[ro]

Incorporate review comments.

[alekseyshl]

test/asan/TestCases/alloca_loop_unpoisoning.cc

17

The common test headers make sense, but as a separate refactoring patch.

[ro]

Thanks. Could you please commit this for me?

test/asan/TestCases/alloca_loop_unpoisoning.cc

17

Certainly. I'll have a look once I have a chance.

[krytarowski]

test/asan/TestCases/alloca_vla_interact.cc

17

I think we should reverse this check.

Include <alloca.h> for SunOS only.

<stdlib.h> is enough for all BSDs, Linux, Windows, MacOSX.

[ro]

test/asan/TestCases/alloca_vla_interact.cc

17

Will do.

[ro]

Only include <alloca.h> on Solaris.

[krytarowski]

Once accepted I can land this for you.

[krytarowski]

@ro For your interest, just in case that it's in the scope of your interest:
there is a work towards merging your work with Illumos and ship in pkgsrc.

http://mail-index.netbsd.org/tech-pkg/2018/01/16/msg019322.html

There are also patches generated locally for SmartOS... it would be great to merge them
instead of keeping in downstream branches.

test/asan/TestCases/alloca_constant_size.cc

14 ↗

(On Diff #129771)

I've added #endif here as a hotfix.

[ro]

In D40900#978241, @krytarowski wrote:

@ro For your interest, just in case that it's in the scope of your interest:
there is a work towards merging your work with Illumos and ship in pkgsrc.

http://mail-index.netbsd.org/tech-pkg/2018/01/16/msg019322.html

That's great news: I saw something like this flying by on Twitter. There will certainly be some
areas where Solaris and Illumos differ, but the majority will be the same.

There are also patches generated locally for SmartOS... it would be great to merge them
instead of keeping in downstream branches.

Absolutely: keeping large patch sets local for a long time creates an incredible amount of
work for everyone. I was totally horrified when I saw the old Solaris userland llvm 3.9 patches:
nobody would have been able to get those upstream.

In my case, getting the sanitizer port upstream was the only way to get it into gcc at all :-)

test/asan/TestCases/alloca_constant_size.cc

14 ↗

(On Diff #129771)

Thanks so much for doing this: this one time I thought I could
things right without a quick check-all. Certainly the last time
I tried that!

[krytarowski]

I propose to get in touch with Jonathan (jperkin) from SmartOS, in order to merge the patches. He doesn't seem to like to upstream patches, so he won't push them here (and he declared so not bother about upstreaming).

I agree that some patches might be local to a building system, but these differences could be managed with generic switches on the cmake/make command line level. Especially in the context that for some reason patching is not needed for stable releases of the toolchain for NetBSD at all.

lib/asan/tests/CMakeLists.txt

generate_asan_tests(ASAN_BENCHMARK_OBJECTS
     LINK_FLAGS ${ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS})
 endfunction()
 
 if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
   set(ASAN_TEST_ARCH ${ASAN_SUPPORTED_ARCH})
   if(APPLE)
     darwin_filter_host_archs(ASAN_SUPPORTED_ARCH ASAN_TEST_ARCH)
   endif()
+  if(OS_NAME MATCHES "SunOS")
+    list(REMOVE_ITEM ASAN_TEST_ARCH x86_64)
+  endif()
 
   foreach(arch ${ASAN_TEST_ARCH})
 
     # Add static ASan runtime that will be linked with uninstrumented tests.
     set(ASAN_TEST_RUNTIME RTAsanTest.${arch})
     if(APPLE)
       set(ASAN_TEST_RUNTIME_OBJECTS
         $<TARGET_OBJECTS:RTAsan_dynamic.osx>

lib/asan/tests/asan_test.cc

 #else
 #if defined(__FreeBSD__)
 #define SANITIZER_GET_C_LOCALE 0
 #elif defined(__NetBSD__)
 #define SANITIZER_GET_C_LOCALE LC_C_LOCALE
 #endif
 #endif
 
+#if defined(__sun__) && defined(__svr4__)
+using std::_setjmp;
+using std::_longjmp;
+#endif
+
 NOINLINE void *malloc_fff(size_t size) {
   void *res = malloc/**/(size); break_optimization(0); return res;}
 NOINLINE void *malloc_eee(size_t size) {
   void *res = malloc_fff(size); break_optimization(0); return res;}
 NOINLINE void *malloc_ddd(size_t size) {
   void *res = malloc_eee(size); break_optimization(0); return res;}
 NOINLINE void *malloc_ccc(size_t size) {
   void *res = malloc_ddd(size); break_optimization(0); return res;}

lib/sanitizer_common/tests/sanitizer_test_utils.h

 # define SANITIZER_TEST_HAS_POSIX_MEMALIGN 1
 #else
 # define SANITIZER_TEST_HAS_POSIX_MEMALIGN 0
 #endif
 
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__ANDROID__) && \
     !defined(__NetBSD__) && !defined(_WIN32)
 # define SANITIZER_TEST_HAS_MEMALIGN 1
+#else
+# define SANITIZER_TEST_HAS_MEMALIGN 0
+#endif
+
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__ANDROID__) && \
+    !defined(__NetBSD__) && !defined(_WIN32) && \
+    !(defined(__sun__) && defined(__svr4__))
 # define SANITIZER_TEST_HAS_PVALLOC 1
 # define SANITIZER_TEST_HAS_MALLOC_USABLE_SIZE 1
 #else
-# define SANITIZER_TEST_HAS_MEMALIGN 0
 # define SANITIZER_TEST_HAS_PVALLOC 0
 # define SANITIZER_TEST_HAS_MALLOC_USABLE_SIZE 0
 #endif
 
 #if !defined(__APPLE__)
 # define SANITIZER_TEST_HAS_STRNLEN 1
 #else
 # define SANITIZER_TEST_HAS_STRNLEN 0

test/asan/CMakeLists.txt

if(NOT COMPILER_RT_STANDALONE_BUILD)
   endif()
 endif()
 set(ASAN_DYNAMIC_TEST_DEPS ${ASAN_TEST_DEPS})
 
 set(ASAN_TEST_ARCH ${ASAN_SUPPORTED_ARCH})
 if(APPLE)
   darwin_filter_host_archs(ASAN_SUPPORTED_ARCH ASAN_TEST_ARCH)
 endif()
+if(OS_NAME MATCHES "SunOS")
+  list(REMOVE_ITEM ASAN_TEST_ARCH x86_64)
+endif()
 
 foreach(arch ${ASAN_TEST_ARCH})
   if(ANDROID)
     set(ASAN_TEST_TARGET_ARCH ${arch}-android)
   else()
     set(ASAN_TEST_TARGET_ARCH ${arch})
   endif()
 

test/asan/TestCases/Posix/asan-sigbus.cpp

 // Check handle_bus flag
 // Defaults to true
 // RUN: %clangxx_asan -std=c++11 %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s -check-prefix=CHECK-BUS
 // RUN: %env_asan_opts=handle_sigbus=0 not --crash %run %t 2>&1 | FileCheck %s
 
 // UNSUPPORTED: ios
 
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <string>
 
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
 char array[4096];
 int main(int argc, char **argv) {
   int fd = open((std::string(argv[0]) + ".m").c_str(), O_RDWR | O_CREAT, 0700);
   if (fd < 0) {
     perror("open");
     exit(1);
   }
   assert(write(fd, array, sizeof(array)) == sizeof(array));

test/asan/TestCases/Posix/coverage.cc

 // RUN: %clangxx_asan -fsanitize-coverage=func,trace-pc-guard -DSHARED %s -shared -o %dynamiclib -fPIC %ld_flags_rpath_so
 // RUN: %clangxx_asan -fsanitize-coverage=func,trace-pc-guard %s %ld_flags_rpath_exe -o %t
 // RUN: rm -rf %T/coverage && mkdir -p %T/coverage && cd %T/coverage
 // RUN: %env_asan_opts=coverage=1:verbosity=1 %run %t 2>&1         | FileCheck %s --check-prefix=CHECK-main
 // RUN: %sancov print coverage.*sancov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV1
 // RUN: %env_asan_opts=coverage=1:verbosity=1 %run %t foo 2>&1     | FileCheck %s --check-prefix=CHECK-foo
 // RUN: %sancov print coverage.*sancov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV2
 // RUN: %env_asan_opts=coverage=1:verbosity=1 %run %t bar 2>&1     | FileCheck %s --check-prefix=CHECK-bar
 // RUN: %sancov print coverage.*sancov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV2
 // RUN: %env_asan_opts=coverage=1:verbosity=1 %run %t foo bar 2>&1 | FileCheck %s --check-prefix=CHECK-foo-bar
 // RUN: %sancov print coverage.*sancov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV2
 // RUN: %sancov print libcoverage.*sancov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV1
 // RUN: %sancov merge coverage.*sancov > merged-cov
 // RUN: %sancov print merged-cov 2>&1 | FileCheck %s --check-prefix=CHECK-SANCOV2
 // RUN: %env_asan_opts=coverage=1:verbosity=1 not %run %t foo bar 4    2>&1 | FileCheck %s --check-prefix=CHECK-report
 // RUN: %env_asan_opts=coverage=1:verbosity=1 not %run %t foo bar 4 5  2>&1 | FileCheck %s --check-prefix=CHECK-segv
-// RUN: rm -r %T/coverage
+// RUN: cd .. && rm -r %T/coverage
 //
 // https://code.google.com/p/address-sanitizer/issues/detail?id=263
 // XFAIL: android
 // UNSUPPORTED: ios
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

test/asan/TestCases/Posix/ioctl.cc

 // RUN: %clangxx_asan -O0 -g %s -o %t && %env_asan_opts=handle_ioctl=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -O3 -g %s -o %t && %env_asan_opts=handle_ioctl=1 not %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_asan -O0 -g %s -o %t && %run %t
 // RUN: %clangxx_asan -O3 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
+#if defined(__sun__) && defined(__svr4__)
+#include <sys/filio.h>
+#endif
+
 int main(int argc, char **argv) {
   int fd = socket(AF_INET, SOCK_DGRAM, 0);
 
   int nonblock;
   int res = ioctl(fd, FIONBIO, &nonblock + 1);
   // CHECK: AddressSanitizer: stack-buffer-overflow
   // CHECK: READ of size 4 at
   // CHECK: {{#.* in main .*ioctl.cc:}}[[@LINE-3]]
   assert(res == 0);
   close(fd);
   return 0;
 }

test/asan/TestCases/alloca_loop_unpoisoning.cc

 // RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 // REQUIRES: stable-runtime
 
 // This testcase checks that allocas and VLAs inside loop are correctly unpoisoned.
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include "sanitizer/asan_interface.h"
 
 // MSVC provides _alloca instead of alloca.
 #if defined(_MSC_VER) && !defined(alloca)
 # define alloca _alloca
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
+#else
+#include <alloca.h>
 #endif
 
 void *top, *bot;
 
 __attribute__((noinline)) void foo(int len) {
   char x;
   top = &x;
   char array[len];  // NOLINT

test/asan/TestCases/alloca_vla_interact.cc

 // RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 // REQUIRES: stable-runtime
 
 // This testcase checks correct interaction between VLAs and allocas.
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include "sanitizer/asan_interface.h"
 
 // MSVC provides _alloca instead of alloca.
 #if defined(_MSC_VER) && !defined(alloca)
 # define alloca _alloca
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
+#else
+#include <alloca.h>
 #endif
 
 #define RZ 32
 
 __attribute__((noinline)) void foo(int len) {
   char *top, *bot;
   // This alloca call should live until the end of foo.
   char *alloca1 = (char *)alloca(len);

test/asan/TestCases/debug_double_free.cc

 // If we use %p with MSVC, it comes out all upper case. Use %08x to get
 // lowercase hex.
 #ifdef _MSC_VER
 # ifdef _WIN64
 #  define PTR_FMT "0x%08llx"
 # else
 #  define PTR_FMT "0x%08x"
 # endif
+// Solaris libc omits the leading 0x.
+#elif defined(__sun__) && defined(__svr4__)
+# define PTR_FMT "0x%p"
 #else
 # define PTR_FMT "%p"
 #endif
 
 char *heap_ptr;
 
 int main() {
   // Disable stderr buffering. Needed on Windows.

test/asan/TestCases/debug_report.cc

 // If we use %p with MSVC, it comes out all upper case. Use %08x to get
 // lowercase hex.
 #ifdef _MSC_VER
 # ifdef _WIN64
 #  define PTR_FMT "0x%08llx"
 # else
 #  define PTR_FMT "0x%08x"
 # endif
+// Solaris libc omits the leading 0x.
+#elif defined(__sun__) && defined(__svr4__)
+# define PTR_FMT "0x%p"
 #else
 # define PTR_FMT "%p"
 #endif
 
 void __asan_on_error() {
   int present = __asan_report_present();
   void *pc = __asan_get_report_pc();
   void *bp = __asan_get_report_bp();

test/asan/TestCases/malloc-no-intercept.c

 // Test that on non-glibc platforms, a number of malloc-related functions are
 // not intercepted.
 
 // RUN: not %clang_asan -Dtestfunc=mallinfo %s -o %t
 // RUN: not %clang_asan -Dtestfunc=mallopt  %s -o %t
 // RUN: not %clang_asan -Dtestfunc=memalign %s -o %t
 // RUN: not %clang_asan -Dtestfunc=pvalloc  %s -o %t
 // RUN: not %clang_asan -Dtestfunc=cfree    %s -o %t
 
 // Conflicts with BIONIC declarations.
 // UNSUPPORTED: android
 
+// Inhibit conflicting declaration of memalign on Solaris.
+#if defined(__sun__) && defined(__svr4__)
+#undef __EXTENSIONS__
+#endif
+
 #include <stdlib.h>
 
 // For glibc, cause link failures by referencing a nonexistent function.
 #ifdef __GLIBC__
 #undef testfunc
 #define testfunc nonexistent_function
 #endif
 
 void testfunc(void);
 
 int main(void)
 {
   testfunc();
   return 0;
 }

test/asan/lit.cfg

if config.host_os == 'Windows':
   config.substitutions.append(('%fPIE', ''))
   config.substitutions.append(('%pie', ''))
 else:
   config.substitutions.append(('%fPIC', '-fPIC'))
   config.substitutions.append(('%fPIE', '-fPIE'))
   config.substitutions.append(('%pie', '-pie'))
 
 # Only run the tests on supported OSs.
-if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows']:
+if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'SunOS', 'Windows']:
   config.unsupported = True
 
 if config.host_os == 'Darwin' and config.target_arch in ["x86_64", "x86_64h"]:
   config.parallelism_group = "darwin-64bit-sanitizer"

test/lit.common.cfg

if config.host_os == 'Darwin':
   config.substitutions.append( ("%ld_flags_rpath_exe", '-Wl,-rpath,@executable_path/ %dynamiclib') )
   config.substitutions.append( ("%ld_flags_rpath_so", '-install_name @rpath/`basename %dynamiclib`') )
 elif config.host_os == 'FreeBSD':
   config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-z,origin -Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )
   config.substitutions.append( ("%ld_flags_rpath_so", '') )
 elif config.host_os == 'Linux':
   config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )
   config.substitutions.append( ("%ld_flags_rpath_so", '') )
+elif config.host_os == 'SunOS':
+  config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-R\$ORIGIN -L%T -l%xdynamiclib_namespec") )
+  config.substitutions.append( ("%ld_flags_rpath_so", '') )
 
 # Must be defined after the substitutions that use %dynamiclib.
 config.substitutions.append( ("%dynamiclib", '%T/%xdynamiclib_filename') )
 config.substitutions.append( ("%xdynamiclib_filename", 'lib%xdynamiclib_namespec.so') )
 config.substitutions.append( ("%xdynamiclib_namespec", '%basename_t.dynamic') )
 
 config.default_sanitizer_opts = []
 if config.host_os == 'Darwin':

test/sanitizer_common/CMakeLists.txt

 set(SANITIZER_COMMON_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(SANITIZER_COMMON_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 set(SANITIZER_COMMON_TESTSUITES)
 
 set(SUPPORTED_TOOLS)
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|SunOS")
   list(APPEND SUPPORTED_TOOLS asan)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT ANDROID)
   list(APPEND SUPPORTED_TOOLS tsan)
   list(APPEND SUPPORTED_TOOLS msan)
   list(APPEND SUPPORTED_TOOLS lsan)
   list(APPEND SUPPORTED_TOOLS ubsan)
 endif()

test/ubsan/CMakeLists.txt

if(COMPILER_RT_HAS_LLD AND arch STREQUAL "x86_64" AND NOT (APPLE OR WIN32))
     add_ubsan_testsuite(${test_mode} ${sanitizer} ${arch} True False)
   endif()
 endmacro()
 
 set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_ARCH})
 if(APPLE)
   darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH)
 endif()
+if(OS_NAME MATCHES "SunOS")
+  list(REMOVE_ITEM UBSAN_TEST_ARCH x86_64)
+endif()
 
 foreach(arch ${UBSAN_TEST_ARCH})
   set(UBSAN_TEST_TARGET_ARCH ${arch})
   get_test_cc_for_arch(${arch} UBSAN_TEST_TARGET_CC UBSAN_TEST_TARGET_CFLAGS)
   add_ubsan_testsuites("Standalone" ubsan ${arch})
 
   if(COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
     # TODO(wwchrome): Re-enable ubsan for asan win 64-bit when ready.

test/ubsan/TestCases/Float/cast-overflow.cpp

 #  define BYTE_ORDER _BYTE_ORDER
 # endif
 # ifndef BIG_ENDIAN
 #  define BIG_ENDIAN _BIG_ENDIAN
 # endif
 # ifndef LITTLE_ENDIAN
 #  define LITTLE_ENDIAN _LITTLE_ENDIAN
 # endif
+#elif defined(__sun__) && defined(__svr4__)
+// Solaris provides _BIG_ENDIAN/_LITTLE_ENDIAN selector in sys/types.h.
+# include <sys/types.h>
+# define BIG_ENDIAN 4321
+# define LITTLE_ENDIAN 1234
+# if defined(_BIG_ENDIAN)
+#  define BYTE_ORDER BIG_ENDIAN
+# else
+#  define BYTE_ORDER LITTLE_ENDIAN
+# endif
 #elif defined(_WIN32)
 # define BYTE_ORDER 0
 # define BIG_ENDIAN 1
 # define LITTLE_ENDIAN 0
 #else
 # include <endian.h>
 # define BYTE_ORDER __BYTE_ORDER
 # define BIG_ENDIAN __BIG_ENDIAN

test/ubsan/lit.common.cfg

 config.substitutions.append( ("%clang ", build_invocation(clang_ubsan_cflags)) )
 config.substitutions.append( ("%clangxx ", build_invocation(clang_ubsan_cxxflags)) )
 config.substitutions.append( ("%gmlt ", " ".join(config.debug_info_flags) + " ") )
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
 # Check that the host supports UndefinedBehaviorSanitizer tests
-if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows', 'NetBSD']:
+if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows', 'NetBSD', 'SunOS']:
   config.unsupported = True
 
 config.available_features.add('arch=' + config.target_arch)
 
 config.excludes = ['Inputs']

test/ubsan_minimal/CMakeLists.txt

 set(UBSAN_LIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_ARCH})
 if(APPLE)
   darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH)
 endif()
+if(OS_NAME MATCHES "SunOS")
+  list(REMOVE_ITEM UBSAN_TEST_ARCH x86_64)
+endif()
 
 set(UBSAN_TESTSUITES)
 set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND UBSAN_TEST_DEPS ubsan-minimal)
 endif()
 
 foreach(arch ${UBSAN_TEST_ARCH})