Skip to content

Simplify Rust to Clang target conversion #2808

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

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Simplify Rust to Clang target conversion #2808

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
66 changes: 28 additions & 38 deletions bindgen/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,45 +686,31 @@ pub(crate) const HOST_TARGET: &str =
// Some architecture triplets are different between rust and libclang, see #1211
// and duplicates.
fn rust_to_clang_target(rust_target: &str) -> Box<str> {
if rust_target.starts_with("aarch64-apple-") {
let mut clang_target = "arm64-apple-".to_owned();
clang_target
.push_str(rust_target.strip_prefix("aarch64-apple-").unwrap());
return clang_target.into();
} else if rust_target.starts_with("riscv64gc-") {
let mut clang_target = "riscv64-".to_owned();
clang_target.push_str(rust_target.strip_prefix("riscv64gc-").unwrap());
return clang_target.into();
} else if rust_target.starts_with("riscv64imac-") {
let mut clang_target = "riscv64-".to_owned();
clang_target
.push_str(rust_target.strip_prefix("riscv64imac-").unwrap());
return clang_target.into();
} else if rust_target.ends_with("-espidf") {
let mut clang_target =
rust_target.strip_suffix("-espidf").unwrap().to_owned();
clang_target.push_str("-elf");
if clang_target.starts_with("riscv32imc-") {
clang_target = "riscv32-".to_owned() +
clang_target.strip_prefix("riscv32imc-").unwrap();
}
return clang_target.into();
} else if rust_target.starts_with("riscv32imc-") {
let mut clang_target = "riscv32-".to_owned();
clang_target.push_str(rust_target.strip_prefix("riscv32imc-").unwrap());
return clang_target.into();
} else if rust_target.starts_with("riscv32imac-") {
let mut clang_target = "riscv32-".to_owned();
clang_target
.push_str(rust_target.strip_prefix("riscv32imac-").unwrap());
return clang_target.into();
} else if rust_target.starts_with("riscv32imafc-") {
let mut clang_target = "riscv32-".to_owned();
clang_target
.push_str(rust_target.strip_prefix("riscv32imafc-").unwrap());
return clang_target.into();
const TRIPLE_HYPHENS_MESSAGE: &str = "Target triple should contain hyphens";

let mut clang_target = rust_target.to_owned();

if clang_target.starts_with("riscv32") {
let idx = clang_target.find('-').expect(TRIPLE_HYPHENS_MESSAGE);

clang_target.replace_range(..idx, "riscv32");
} else if clang_target.starts_with("riscv64") {
let idx = clang_target.find('-').expect(TRIPLE_HYPHENS_MESSAGE);

clang_target.replace_range(..idx, "riscv64");
} else if clang_target.starts_with("aarch64-apple-") {
let idx = clang_target.find('-').expect(TRIPLE_HYPHENS_MESSAGE);

clang_target.replace_range(..idx, "arm64");
}
rust_target.into()

if clang_target.ends_with("-espidf") {
let idx = clang_target.rfind('-').expect(TRIPLE_HYPHENS_MESSAGE);

clang_target.replace_range((idx + 1).., "elf");
}

clang_target.into()
}

/// Returns the effective target, and whether it was explicitly specified on the
Expand Down Expand Up @@ -1383,6 +1369,10 @@ fn test_rust_to_clang_target_riscv() {
rust_to_clang_target("riscv32imafc-unknown-none-elf").as_ref(),
"riscv32-unknown-none-elf"
);
assert_eq!(
rust_to_clang_target("riscv32i-unknown-none-elf").as_ref(),
"riscv32-unknown-none-elf"
);
}

#[test]
Expand Down