diff --git a/Cargo.lock b/Cargo.lock
index 3f71a7000d7..1ea00eb5112 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4345,6 +4345,7 @@ version = "0.1.0"
dependencies = [
"async-process",
"crash-handler",
+ "libc",
"log",
"mach2 0.5.0",
"minidumper",
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index f8b898112c1..1b118097cb4 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -16,6 +16,9 @@ serde_json.workspace = true
system_specs.workspace = true
zstd.workspace = true
+[target.'cfg(target_os = "linux")'.dependencies]
+libc.workspace = true
+
[target.'cfg(target_os = "macos")'.dependencies]
mach2.workspace = true
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index 28217496cad..eef3ab4055b 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -138,6 +138,17 @@ where
info!("crash signal handlers installed");
send_crash_server_message(&client, CrashServerMessage::Init(crash_init));
+ #[cfg(all(target_os = "linux", target_env = "gnu"))]
+ if let Some(address) = abort_message_address() {
+ send_crash_server_message(
+ &client,
+ CrashServerMessage::AbortMessageLocation(AbortMessageLocation {
+ pid: process::id(),
+ address,
+ }),
+ );
+ }
+
#[cfg(target_os = "linux")]
handler.set_ptracer(Some(_crash_handler.id()));
@@ -170,6 +181,7 @@ pub struct CrashServer {
panic_info: Mutex