Rollup merge of #152111 - androm3da:bcain/qurt_unwind, r=jieyouxu
bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default Hexagon Linux targets (hexagon-unknown-linux-musl) use in-tree llvm-libunwind for stack unwinding. However, hexagon-unknown-qurt uses libc_eh from the Hexagon SDK instead.
This commit is contained in:
commit
e7518ac7e0
1 changed files with 11 additions and 5 deletions
|
|
@ -1859,11 +1859,17 @@ impl Config {
|
|||
.get(&target)
|
||||
.and_then(|t| t.llvm_libunwind)
|
||||
.or(self.llvm_libunwind_default)
|
||||
.unwrap_or(if target.contains("fuchsia") || target.contains("hexagon") {
|
||||
LlvmLibunwind::InTree
|
||||
} else {
|
||||
LlvmLibunwind::No
|
||||
})
|
||||
.unwrap_or(
|
||||
if target.contains("fuchsia")
|
||||
|| (target.contains("hexagon") && !target.contains("qurt"))
|
||||
{
|
||||
// Fuchsia and Hexagon Linux use in-tree llvm-libunwind.
|
||||
// Hexagon QuRT uses libc_eh from the Hexagon SDK instead.
|
||||
LlvmLibunwind::InTree
|
||||
} else {
|
||||
LlvmLibunwind::No
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
pub fn split_debuginfo(&self, target: TargetSelection) -> SplitDebuginfo {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue