diff --git a/src/tools/run-make-support/src/llvm.rs b/src/tools/run-make-support/src/llvm.rs
index 414251abda294..664093e072d72 100644
--- a/src/tools/run-make-support/src/llvm.rs
+++ b/src/tools/run-make-support/src/llvm.rs
@@ -4,18 +4,21 @@ use crate::{env_var, Command};
 
 /// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
 /// at `$LLVM_BIN_DIR/llvm-readobj`.
+#[track_caller]
 pub fn llvm_readobj() -> LlvmReadobj {
     LlvmReadobj::new()
 }
 
 /// Construct a new `llvm-profdata` invocation. This assumes that `llvm-profdata` is available
 /// at `$LLVM_BIN_DIR/llvm-profdata`.
+#[track_caller]
 pub fn llvm_profdata() -> LlvmProfdata {
     LlvmProfdata::new()
 }
 
 /// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
 /// at `$LLVM_FILECHECK`.
+#[track_caller]
 pub fn llvm_filecheck() -> LlvmFilecheck {
     LlvmFilecheck::new()
 }
@@ -55,6 +58,7 @@ pub fn llvm_bin_dir() -> PathBuf {
 impl LlvmReadobj {
     /// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
     /// at `$LLVM_BIN_DIR/llvm-readobj`.
+    #[track_caller]
     pub fn new() -> Self {
         let llvm_readobj = llvm_bin_dir().join("llvm-readobj");
         let cmd = Command::new(llvm_readobj);
@@ -77,6 +81,7 @@ impl LlvmReadobj {
 impl LlvmProfdata {
     /// Construct a new `llvm-profdata` invocation. This assumes that `llvm-profdata` is available
     /// at `$LLVM_BIN_DIR/llvm-profdata`.
+    #[track_caller]
     pub fn new() -> Self {
         let llvm_profdata = llvm_bin_dir().join("llvm-profdata");
         let cmd = Command::new(llvm_profdata);
@@ -107,6 +112,7 @@ impl LlvmProfdata {
 impl LlvmFilecheck {
     /// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
     /// at `$LLVM_FILECHECK`.
+    #[track_caller]
     pub fn new() -> Self {
         let llvm_filecheck = env_var("LLVM_FILECHECK");
         let cmd = Command::new(llvm_filecheck);
diff --git a/src/tools/run-make-support/src/llvm_readobj.rs b/src/tools/run-make-support/src/llvm_readobj.rs
deleted file mode 100644
index 3c719356e8f38..0000000000000
--- a/src/tools/run-make-support/src/llvm_readobj.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use crate::command::Command;
-use crate::env_var;
-
-/// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
-/// at `$LLVM_BIN_DIR/llvm-readobj`.
-#[track_caller]
-pub fn llvm_readobj() -> LlvmReadobj {
-    LlvmReadobj::new()
-}
-
-/// A `llvm-readobj` invocation builder.
-#[derive(Debug)]
-#[must_use]
-pub struct LlvmReadobj {
-    cmd: Command,
-}
-
-crate::impl_common_helpers!(LlvmReadobj);
-
-impl LlvmReadobj {
-    /// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
-    /// at `$LLVM_BIN_DIR/llvm-readobj`.
-    #[track_caller]
-    pub fn new() -> Self {
-        let llvm_bin_dir = env_var("LLVM_BIN_DIR");
-        let llvm_bin_dir = PathBuf::from(llvm_bin_dir);
-        let llvm_readobj = llvm_bin_dir.join("llvm-readobj");
-        let cmd = Command::new(llvm_readobj);
-        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
-    }
-
-    /// Pass `--file-header` to display file headers.
-    pub fn file_header(&mut self) -> &mut Self {
-        self.cmd.arg("--file-header");
-        self
-    }
-}