[llvm-branch-commits] [compiler-rt] f8a0ecf - [compiler-rt] Avoid depending on the libnvmm header for NetBSD (#153534)

[Tobias Hieta via llvm-branch-commits]

Author: Alex Rønne Petersen
Date: 2025-09-08T09:34:13+02:00
New Revision: f8a0ecfc6108fc51f2ff518307b5e005e85b0e7f

URL: https://github.com/llvm/llvm-project/commit/f8a0ecfc6108fc51f2ff518307b5e005e85b0e7f
DIFF: https://github.com/llvm/llvm-project/commit/f8a0ecfc6108fc51f2ff518307b5e005e85b0e7f.diff

LOG: [compiler-rt] Avoid depending on the libnvmm header for NetBSD (#153534)

Use the system headers instead since we don't actually need anything
from libnvmm; we only care about ioctls and related structures.

This makes it possible to cross-compile TSan for NetBSD with `zig cc`
which does not provide libnvmm when cross-compiling.

I also removed a `term.h` include (ncurses) which appeared to be
unnecessary and likewise prevented cross-compilation with `zig cc` from
working.

(cherry picked from commit 9ec771bd4a16198cec04b4b9c30c22ee89140a2d)

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
index aacd28c55ceaa..435f3b2861dc9 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
@@ -498,7 +498,6 @@ struct urio_command {
 #include <md5.h>
 #include <rmd160.h>
 #include <soundcard.h>
-#include <term.h>
 #include <termios.h>
 #include <time.h>
 #include <ttyent.h>
@@ -515,7 +514,7 @@ struct urio_command {
 #include <stringlist.h>
 
 #if defined(__x86_64__)
-#include <nvmm.h>
+#include <dev/nvmm/nvmm_ioctl.h>
 #endif
 // clang-format on