diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-05-15 20:29:49 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-05-15 20:29:49 +0000 |
| commit | e58d5a45e1e1c283d3247852fa659d324f4e2e8f (patch) | |
| tree | 5d8d02b4ba38c05fa826dc3efc4637d840fe119e | |
| parent | 9916d8de7da5c9438af96203602aeeeaca033d84 (diff) | |
| download | llvm-e58d5a45e1e1c283d3247852fa659d324f4e2e8f.zip llvm-e58d5a45e1e1c283d3247852fa659d324f4e2e8f.tar.gz llvm-e58d5a45e1e1c283d3247852fa659d324f4e2e8f.tar.bz2 | |
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.
------------------------------------------------------------------------
llvm-svn: 360811
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc index c112e04..c32c80b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc @@ -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> |