diff options
| -rw-r--r-- | cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | lib/safestack/safestack.cc | 2 | ||||
| -rw-r--r-- | test/safestack/lit.cfg | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 84ffa3904..078a62e49 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -541,7 +541,7 @@ else() endif() if (COMPILER_RT_HAS_SANITIZER_COMMON AND SAFESTACK_SUPPORTED_ARCH AND - OS_NAME MATCHES "Darwin|Linux|FreeBSD") + OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD") set(COMPILER_RT_HAS_SAFESTACK TRUE) else() set(COMPILER_RT_HAS_SAFESTACK FALSE) diff --git a/lib/safestack/safestack.cc b/lib/safestack/safestack.cc index b194b6cfa..d783cd5a9 100644 --- a/lib/safestack/safestack.cc +++ b/lib/safestack/safestack.cc @@ -21,7 +21,9 @@ #include <unistd.h> #include <sys/resource.h> #include <sys/types.h> +#if !defined(__NetBSD__) #include <sys/user.h> +#endif #include "interception/interception.h" #include "sanitizer_common/sanitizer_common.h" diff --git a/test/safestack/lit.cfg b/test/safestack/lit.cfg index fb5672936..87b678320 100644 --- a/test/safestack/lit.cfg +++ b/test/safestack/lit.cfg @@ -18,8 +18,7 @@ config.substitutions.append( ("%clang_safestack ", config.clang + " -O0 -fsaniti if config.lto_supported: config.substitutions.append((r"%clang_lto_safestack ", ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-fsanitize=safe-stack ']))) -# SafeStack tests are currently supported on Linux, FreeBSD and Darwin only. -if config.host_os not in ['Linux', 'FreeBSD', 'Darwin']: +if config.host_os not in ['Linux', 'FreeBSD', 'Darwin', 'NetBSD']: config.unsupported = True # Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL |