Skip to content

Add support for NetBSD/amd64 #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmmv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for NetBSD/amd64 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/addr_validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn create_pipe() -> nix::Result<(i32, i32)> {
}

#[inline]
#[cfg(any(target_os = "macos", target_os = "freebsd"))]
#[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "netbsd"))]
fn create_pipe() -> nix::Result<(i32, i32)> {
use nix::fcntl::{fcntl, FcntlArg, FdFlag, OFlag};
use nix::unistd::pipe;
Expand Down
12 changes: 8 additions & 4 deletions src/profiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ struct ErrnoProtector(libc::c_int);
impl ErrnoProtector {
fn new() -> Self {
unsafe {
#[cfg(target_os = "android")]
#[cfg(any(target_os = "android", target_os = "netbsd"))]
{
let errno = *libc::__errno();
Self(errno)
Expand All @@ -255,7 +255,7 @@ impl ErrnoProtector {
impl Drop for ErrnoProtector {
fn drop(&mut self) {
unsafe {
#[cfg(target_os = "android")]
#[cfg(any(target_os = "android", target_os = "netbsd"))]
{
*libc::__errno() = self.0;
}
Expand Down Expand Up @@ -304,9 +304,13 @@ extern "C" fn perf_signal_handler(
let addr =
unsafe { (*ucontext).uc_mcontext.gregs[libc::REG_RIP as usize] as usize };

#[cfg(all(target_arch = "x86_64", target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
let addr = unsafe { (*ucontext).uc_mcontext.mc_rip as usize };

#[cfg(all(target_arch = "x86_64", target_os = "netbsd"))]
let addr =
unsafe { (*ucontext).uc_mcontext.__gregs[libc::_REG_RIP as usize] as usize };

#[cfg(all(target_arch = "x86_64", target_os = "macos"))]
let addr = unsafe {
let mcontext = (*ucontext).uc_mcontext;
Expand All @@ -323,7 +327,7 @@ extern "C" fn perf_signal_handler(
))]
let addr = unsafe { (*ucontext).uc_mcontext.pc as usize };

#[cfg(all(target_arch = "aarch64", target_os = "freebsd"))]
#[cfg(all(target_arch = "aarch64", any(target_os = "freebsd", target_os = "netbsd")))]
let addr = unsafe { (*ucontext).mc_gpregs.gp_elr as usize };

#[cfg(all(target_arch = "aarch64", target_os = "macos"))]
Expand Down
Loading