forked from void-linux/void-packages
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
doesn't build on musl yet, see: rust-minidump/minidump-writer#4 probably won't build on ppc either, see: https://github.com/msirringhaus/minidump_writer_linux/tree/main/src/thread_info
- Loading branch information
Showing
3 changed files
with
55 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
diff --git third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs | ||
index 0d427ae3..12e71446 100644 | ||
--- third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs | ||
+++ third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs | ||
@@ -532,6 +532,33 @@ pub const PRIO_PROCESS: ::c_int = 0; | ||
pub const PRIO_PGRP: ::c_int = 1; | ||
pub const PRIO_USER: ::c_int = 2; | ||
|
||
+// sys/auxv.h | ||
+pub const AT_NULL: ::c_ulong = 0; | ||
+pub const AT_IGNORE: ::c_ulong = 1; | ||
+pub const AT_EXECFD: ::c_ulong = 2; | ||
+pub const AT_PHDR: ::c_ulong = 3; | ||
+pub const AT_PHENT: ::c_ulong = 4; | ||
+pub const AT_PHNUM: ::c_ulong = 5; | ||
+pub const AT_PAGESZ: ::c_ulong = 6; | ||
+pub const AT_BASE: ::c_ulong = 7; | ||
+pub const AT_FLAGS: ::c_ulong = 8; | ||
+pub const AT_ENTRY: ::c_ulong = 9; | ||
+pub const AT_NOTELF: ::c_ulong = 10; | ||
+pub const AT_UID: ::c_ulong = 11; | ||
+pub const AT_EUID: ::c_ulong = 12; | ||
+pub const AT_GID: ::c_ulong = 13; | ||
+pub const AT_EGID: ::c_ulong = 14; | ||
+pub const AT_PLATFORM: ::c_ulong = 15; | ||
+pub const AT_HWCAP: ::c_ulong = 16; | ||
+pub const AT_CLKTCK: ::c_ulong = 17; | ||
+// AT_* values 18 through 22 are reserved | ||
+pub const AT_SECURE: ::c_ulong = 23; | ||
+pub const AT_BASE_PLATFORM: ::c_ulong = 24; | ||
+pub const AT_RANDOM: ::c_ulong = 25; | ||
+pub const AT_HWCAP2: ::c_ulong = 26; | ||
+ | ||
+pub const AT_EXECFN: ::c_ulong = 31; | ||
+ | ||
extern "C" { | ||
pub fn sendmmsg( | ||
sockfd: ::c_int, | ||
diff --git third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs | ||
index 0e34a6dd..5763eb7e 100644 | ||
--- third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs | ||
+++ third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs | ||
@@ -108,7 +108,7 @@ impl LinuxPtraceDumper { | ||
Err(_) => continue, | ||
} | ||
} | ||
- #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] | ||
+ #[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "x86"), target_env = "gnu"))] | ||
{ | ||
// On x86, the stack pointer is NULL or -1, when executing trusted code in | ||
// the seccomp sandbox. Not only does this cause difficulties down the line |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters