diff --git a/samply-mac-preload/Cargo.toml b/samply-mac-preload/Cargo.toml index 7b4deab7..87595aa7 100644 --- a/samply-mac-preload/Cargo.toml +++ b/samply-mac-preload/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" # This crate is not part of the samply workspace. [lib] -crate_type = ["cdylib"] +crate-type = ["cdylib"] [profile.dev] panic = "abort" diff --git a/samply-mac-preload/binaries/libsamply_mac_preload.dylib b/samply-mac-preload/binaries/libsamply_mac_preload.dylib index 7a881520..0c1fc394 100755 Binary files a/samply-mac-preload/binaries/libsamply_mac_preload.dylib and b/samply-mac-preload/binaries/libsamply_mac_preload.dylib differ diff --git a/samply-mac-preload/binaries/libsamply_mac_preload_arm64.dylib b/samply-mac-preload/binaries/libsamply_mac_preload_arm64.dylib index 75e1f326..efa29040 100755 Binary files a/samply-mac-preload/binaries/libsamply_mac_preload_arm64.dylib and b/samply-mac-preload/binaries/libsamply_mac_preload_arm64.dylib differ diff --git a/samply-mac-preload/binaries/libsamply_mac_preload_arm64e.dylib b/samply-mac-preload/binaries/libsamply_mac_preload_arm64e.dylib new file mode 100755 index 00000000..500af622 Binary files /dev/null and b/samply-mac-preload/binaries/libsamply_mac_preload_arm64e.dylib differ diff --git a/samply-mac-preload/binaries/libsamply_mac_preload_x86_64.dylib b/samply-mac-preload/binaries/libsamply_mac_preload_x86_64.dylib index 89bce091..646f38df 100755 Binary files a/samply-mac-preload/binaries/libsamply_mac_preload_x86_64.dylib and b/samply-mac-preload/binaries/libsamply_mac_preload_x86_64.dylib differ diff --git a/samply-mac-preload/build.sh b/samply-mac-preload/build.sh index 7ef2f77d..2612e3d6 100755 --- a/samply-mac-preload/build.sh +++ b/samply-mac-preload/build.sh @@ -1,9 +1,9 @@ export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -MACOSX_DEPLOYMENT_TARGET=10.7 cargo build --release --target=x86_64-apple-darwin +MACOSX_DEPLOYMENT_TARGET=10.12 cargo build --release --target=x86_64-apple-darwin mv target/x86_64-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_x86_64.dylib MACOSX_DEPLOYMENT_TARGET=11.0 cargo build --release --target=aarch64-apple-darwin mv target/aarch64-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_arm64.dylib -MACOSX_DEPLOYMENT_TARGET=11.0 RUSTC_BOOTSTRAP=1 cargo build --release --target=arm64e-apple-darwin -Zbuild-std +MACOSX_DEPLOYMENT_TARGET=11.0 RUSTC_BOOTSTRAP=1 cargo build --release --target=arm64e-apple-darwin -Zbuild-std=core mv target/arm64e-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_arm64e.dylib lipo binaries/libsamply_mac_preload_* -create -output binaries/libsamply_mac_preload.dylib gzip -cvf binaries/libsamply_mac_preload.dylib > ../samply/resources/libsamply_mac_preload.dylib.gz diff --git a/samply-mac-preload/src/mach_ipc.rs b/samply-mac-preload/src/mach_ipc.rs index 3da151bc..abde1d1a 100644 --- a/samply-mac-preload/src/mach_ipc.rs +++ b/samply-mac-preload/src/mach_ipc.rs @@ -441,18 +441,6 @@ impl OsIpcChannel { } } -#[derive(PartialEq, Eq, Debug)] -pub struct OsOpaqueIpcChannel { - port: mach_port_t, -} - -impl Drop for OsOpaqueIpcChannel { - fn drop(&mut self) { - // Make sure we don't leak! - debug_assert!(self.port == MACH_PORT_NULL); - } -} - unsafe fn setup_receive_buffer(buffer: &mut [u8], port_name: mach_port_t) { let message = &buffer[0] as *const u8 as *mut mach_msg_header_t; (*message).msgh_local_port = port_name; diff --git a/samply/resources/libsamply_mac_preload.dylib.gz b/samply/resources/libsamply_mac_preload.dylib.gz index 0032c3f1..e8085588 100644 Binary files a/samply/resources/libsamply_mac_preload.dylib.gz and b/samply/resources/libsamply_mac_preload.dylib.gz differ