diff --git a/src/archive.rs b/src/archive.rs
index f863abdcc97..14a69c194e4 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -1,6 +1,8 @@
 use std::fs::File;
 use std::path::{Path, PathBuf};
 
+use crate::errors::RanlibFailure;
+
 use rustc_codegen_ssa::back::archive::{ArchiveBuilder, ArchiveBuilderBuilder};
 use rustc_session::Session;
 
@@ -181,7 +183,7 @@ enum BuilderKind<'a> {
             std::process::Command::new("ranlib").arg(output).status().expect("Couldn't run ranlib");
 
         if !status.success() {
-            self.config.sess.fatal(&format!("Ranlib exited with code {:?}", status.code()));
+            self.config.sess.emit_fatal(RanlibFailure { exit_code: status.code() });
         }
 
         any_members
diff --git a/src/errors.rs b/src/errors.rs
new file mode 100644
index 00000000000..1a0e38fc0bb
--- /dev/null
+++ b/src/errors.rs
@@ -0,0 +1,7 @@
+use rustc_macros::SessionDiagnostic;
+
+#[derive(SessionDiagnostic)]
+#[diag(codegen_gcc::ranlib_failure)]
+pub(crate) struct RanlibFailure {
+    pub exit_code: Option<i32>
+}
diff --git a/src/lib.rs b/src/lib.rs
index 36aa071fd0f..45e85034cc1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,6 +26,7 @@
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_hir;
+extern crate rustc_macros;
 extern crate rustc_metadata;
 extern crate rustc_middle;
 extern crate rustc_session;
@@ -52,6 +53,7 @@
 mod coverageinfo;
 mod debuginfo;
 mod declare;
+mod errors;
 mod int;
 mod intrinsic;
 mod mono_item;