Skip to content
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

Use dl_iterate_phdr on Haiku #699

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use dl_iterate_phdr on Haiku #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3dfe7a
Use dl_iterate_phdr on Haiku
bjorn3 Feb 8, 2025
f3be301
Disable test that doesn't work on Haiku
bjorn3 Feb 8, 2025
a57a353
Update apt package list before installing libc6-dbg
bjorn3 Feb 8, 2025
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 .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

# Starting with Ubuntu 22.04 libc6-dbg is needed.
- name: Install libc debug info
run: sudo apt-get install -y libc6-dbg
run: sudo apt-get update && sudo apt-get install -y libc6-dbg
shell: bash
if: contains(matrix.os, 'ubuntu-24.04')

Expand Down
4 changes: 1 addition & 3 deletions src/symbolize/gimli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ cfg_if::cfg_if! {
target_os = "linux",
target_os = "fuchsia",
target_os = "freebsd",
target_os = "haiku",
target_os = "hurd",
target_os = "openbsd",
target_os = "netbsd",
Expand All @@ -238,9 +239,6 @@ cfg_if::cfg_if! {
} else if #[cfg(target_env = "libnx")] {
mod libs_libnx;
use libs_libnx::native_libraries;
} else if #[cfg(target_os = "haiku")] {
mod libs_haiku;
use libs_haiku::native_libraries;
} else if #[cfg(target_os = "aix")] {
mod libs_aix;
use libs_aix::native_libraries;
Expand Down
50 changes: 0 additions & 50 deletions src/symbolize/gimli/libs_haiku.rs
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions tests/current-exe-mismatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ use std::process::Command;
mod common;

fn main() {
if cfg!(target_os = "netbsd") {
// NetBSD doesn't support this silliness, so because this is an fn main test,
// just pass it on there. If we used ui-test or something we'd use
if cfg!(target_os = "netbsd") || cfg!(target_os = "haiku") {
// NetBSD and Haiku don't support this silliness, so because this is an fn main
// test just pass it on there. If we used ui-test or something we'd use
//@ ignore-netbsd
//@ ignore-haiku
return;
}

Expand Down