Auto merge of #129076 - matthiaskrgr:rollup-rg8mi2x, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #128410 (Migrate `remap-path-prefix-dwarf` `run-make` test to rmake) - #128759 (alloc: add ToString specialization for `&&str`) - #128873 (Add windows-targets crate to std's sysroot) - #129001 (chore(lib): Enhance documentation for core::fmt::Formatter's write_fm…) - #129061 (Use `is_lang_item` more) - #129062 (Remove a no-longer-true assert) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
9859bf27fd
38 changed files with 543 additions and 261 deletions
|
|
@ -35,7 +35,6 @@ fn main() -> Result<(), Box<dyn Error>> {
|
|||
let mut f = std::fs::File::options().append(true).open("windows_sys.rs")?;
|
||||
f.write_all(ARM32_SHIM.as_bytes())?;
|
||||
writeln!(&mut f, "// ignore-tidy-filelength")?;
|
||||
writeln!(&mut f, "use super::windows_targets;")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ pub fn llvm_bcanalyzer() -> LlvmBcanalyzer {
|
|||
LlvmBcanalyzer::new()
|
||||
}
|
||||
|
||||
/// Construct a new `llvm-dwarfdump` invocation. This assumes that `llvm-dwarfdump` is available
|
||||
/// at `$LLVM_BIN_DIR/llvm-dwarfdump`.
|
||||
pub fn llvm_dwarfdump() -> LlvmDwarfdump {
|
||||
LlvmDwarfdump::new()
|
||||
}
|
||||
|
||||
/// A `llvm-readobj` invocation builder.
|
||||
#[derive(Debug)]
|
||||
#[must_use]
|
||||
|
|
@ -97,6 +103,13 @@ pub struct LlvmBcanalyzer {
|
|||
cmd: Command,
|
||||
}
|
||||
|
||||
/// A `llvm-dwarfdump` invocation builder.
|
||||
#[derive(Debug)]
|
||||
#[must_use]
|
||||
pub struct LlvmDwarfdump {
|
||||
cmd: Command,
|
||||
}
|
||||
|
||||
crate::macros::impl_common_helpers!(LlvmReadobj);
|
||||
crate::macros::impl_common_helpers!(LlvmProfdata);
|
||||
crate::macros::impl_common_helpers!(LlvmFilecheck);
|
||||
|
|
@ -104,6 +117,7 @@ crate::macros::impl_common_helpers!(LlvmObjdump);
|
|||
crate::macros::impl_common_helpers!(LlvmAr);
|
||||
crate::macros::impl_common_helpers!(LlvmNm);
|
||||
crate::macros::impl_common_helpers!(LlvmBcanalyzer);
|
||||
crate::macros::impl_common_helpers!(LlvmDwarfdump);
|
||||
|
||||
/// Generate the path to the bin directory of LLVM.
|
||||
#[must_use]
|
||||
|
|
@ -317,3 +331,19 @@ impl LlvmBcanalyzer {
|
|||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl LlvmDwarfdump {
|
||||
/// Construct a new `llvm-dwarfdump` invocation. This assumes that `llvm-dwarfdump` is available
|
||||
/// at `$LLVM_BIN_DIR/llvm-dwarfdump`.
|
||||
pub fn new() -> Self {
|
||||
let llvm_dwarfdump = llvm_bin_dir().join("llvm-dwarfdump");
|
||||
let cmd = Command::new(llvm_dwarfdump);
|
||||
Self { cmd }
|
||||
}
|
||||
|
||||
/// Provide an input file.
|
||||
pub fn input<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
|
||||
self.cmd.arg(path.as_ref());
|
||||
self
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,8 +49,9 @@ pub use c_build::{build_native_dynamic_lib, build_native_static_lib, build_nativ
|
|||
pub use clang::{clang, Clang};
|
||||
pub use htmldocck::htmldocck;
|
||||
pub use llvm::{
|
||||
llvm_ar, llvm_bcanalyzer, llvm_filecheck, llvm_nm, llvm_objdump, llvm_profdata, llvm_readobj,
|
||||
LlvmAr, LlvmBcanalyzer, LlvmFilecheck, LlvmNm, LlvmObjdump, LlvmProfdata, LlvmReadobj,
|
||||
llvm_ar, llvm_bcanalyzer, llvm_dwarfdump, llvm_filecheck, llvm_nm, llvm_objdump, llvm_profdata,
|
||||
llvm_readobj, LlvmAr, LlvmBcanalyzer, LlvmDwarfdump, LlvmFilecheck, LlvmNm, LlvmObjdump,
|
||||
LlvmProfdata, LlvmReadobj,
|
||||
};
|
||||
pub use python::python_command;
|
||||
pub use rustc::{aux_build, bare_rustc, rustc, Rustc};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ run-make/macos-deployment-target/Makefile
|
|||
run-make/min-global-align/Makefile
|
||||
run-make/native-link-modifier-bundle/Makefile
|
||||
run-make/no-alloc-shim/Makefile
|
||||
run-make/remap-path-prefix-dwarf/Makefile
|
||||
run-make/reproducible-build/Makefile
|
||||
run-make/rlib-format-packed-bundled-libs/Makefile
|
||||
run-make/split-debuginfo/Makefile
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ use crate::walk::{filter_dirs, walk};
|
|||
|
||||
// Paths that may contain platform-specific code.
|
||||
const EXCEPTION_PATHS: &[&str] = &[
|
||||
"library/windows_targets",
|
||||
"library/panic_abort",
|
||||
"library/panic_unwind",
|
||||
"library/unwind",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue