diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-01-31 07:31:07 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-31 07:31:07 -0800 |
| commit | 1765a84c03a37c9bdb7541cb7db49adad5dae6db (patch) | |
| tree | c3c2d1bbc01a75c7f76a0cb5207ec446170a03a5 /src | |
| parent | f4a682c5af1526c48dc2eb025ca2ecddbffa6434 (diff) | |
| parent | c1e50f965c44c0a093921f741cd1bd7af84bda5d (diff) | |
| download | coreclr-1765a84c03a37c9bdb7541cb7db49adad5dae6db.tar.gz coreclr-1765a84c03a37c9bdb7541cb7db49adad5dae6db.tar.bz2 coreclr-1765a84c03a37c9bdb7541cb7db49adad5dae6db.zip | |
Merge pull request #2939 from krytarowski/netbsd-support-17
NetBSD doesn't ship with <machine/npx.h>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pal/src/config.h.in | 2 | ||||
| -rw-r--r-- | src/pal/src/configure.cmake | 2 | ||||
| -rw-r--r-- | src/pal/src/thread/context.cpp | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/pal/src/config.h.in b/src/pal/src/config.h.in index 011db738f3..3871e07007 100644 --- a/src/pal/src/config.h.in +++ b/src/pal/src/config.h.in @@ -6,6 +6,8 @@ #cmakedefine01 HAVE_SYS_VMPARAM_H #cmakedefine01 HAVE_MACH_VM_TYPES_H #cmakedefine01 HAVE_MACH_VM_PARAM_H +#cmakedefine01 HAVE_MACHINE_NPX_H +#cmakedefine01 HAVE_MACHINE_REG_H #cmakedefine01 HAVE_MACHINE_VMPARAM_H #cmakedefine01 HAVE_PROCFS_H #cmakedefine01 HAVE_CRT_EXTERNS_H diff --git a/src/pal/src/configure.cmake b/src/pal/src/configure.cmake index 5f28edd010..203e486c96 100644 --- a/src/pal/src/configure.cmake +++ b/src/pal/src/configure.cmake @@ -23,6 +23,8 @@ check_include_files(alloca.h HAVE_ALLOCA_H) check_include_files(sys/vmparam.h HAVE_SYS_VMPARAM_H) check_include_files(mach/vm_types.h HAVE_MACH_VM_TYPES_H) check_include_files(mach/vm_param.h HAVE_MACH_VM_PARAM_H) +check_include_files("sys/param.h;sys/types.h;machine/npx.h" HAVE_MACHINE_NPX_H) +check_include_files("sys/param.h;sys/cdefs.h;machine/reg.h" HAVE_MACHINE_REG_H) check_include_files(machine/vmparam.h HAVE_MACHINE_VMPARAM_H) check_include_files(procfs.h HAVE_PROCFS_H) check_include_files(crt_externs.h HAVE_CRT_EXTERNS_H) diff --git a/src/pal/src/thread/context.cpp b/src/pal/src/thread/context.cpp index 2165616462..1f48080000 100644 --- a/src/pal/src/thread/context.cpp +++ b/src/pal/src/thread/context.cpp @@ -50,10 +50,13 @@ extern void CONTEXT_CaptureContext(LPCONTEXT lpContext); #if !HAVE_MACH_EXCEPTIONS -#if HAVE_BSD_REGS_T +#if HAVE_MACHINE_REG_H #include <machine/reg.h> +#endif // HAVE_MACHINE_REG_H +#if HAVE_MACHINE_NPX_H #include <machine/npx.h> -#endif // HAVE_BSD_REGS_T +#endif // HAVE_MACHINE_NPX_H + #if HAVE_PT_REGS #include <asm/ptrace.h> #endif // HAVE_PT_REGS |