[llvm-branch-commits] [compiler-rt-branch] r360811 - Merging r360212:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 15 13:29:49 2019
New Revision: 360811

URL: http://llvm.org/viewvc/llvm-project?rev=360811&view=rev
Log:
Merging r360212:

------------------------------------------------------------------------
r360212 | kamil | 2019-05-07 17:44:41 -0700 (Tue, 07 May 2019) | 6 lines

Fix build on NetBSD 8.99.38

With recent changes the dev/nvmm/nvmm_ioctl.h header is no longer
a standalone NVMM header. Disable it until the NVMM operations will
stabilize and be included in the ioctl(2) interceptors.

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_80/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc

Modified: compiler-rt/branches/release_80/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_80/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc?rev=360811&r1=360810&r2=360811&view=diff
==============================================================================
--- compiler-rt/branches/release_80/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc (original)
+++ compiler-rt/branches/release_80/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc Wed May 15 13:29:49 2019
@@ -124,7 +124,9 @@
 #include <dev/isa/isvio.h>
 #include <dev/isa/wtreg.h>
 #include <dev/iscsi/iscsi_ioctl.h>
+#if 0
 #include <dev/nvmm/nvmm_ioctl.h>
+#endif
 #include <dev/ofw/openfirmio.h>
 #include <dev/pci/amrio.h>
 #include <dev/pci/mlyreg.h>