From ca53d2e8bbdfc75820954ec2ad9e087e82a72142 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 14 Oct 2023 13:46:55 +0000
Subject: [PATCH] Change producer string to have the rustc producer string as
 prefix

This fixes the comment-section run-make test
---
 scripts/test_rustc_tests.sh | 2 --
 src/debuginfo/mod.rs        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/test_rustc_tests.sh b/scripts/test_rustc_tests.sh
index e6a8dc99cbd..4b6d5bd97b8 100755
--- a/scripts/test_rustc_tests.sh
+++ b/scripts/test_rustc_tests.sh
@@ -27,8 +27,6 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
 # missing features
 # ================
 
-rm -r tests/run-make/comment-section # cg_clif doesn't yet write the .comment section
-
 # requires stack unwinding
 # FIXME add needs-unwind to these tests
 rm -r tests/run-make/libtest-junit
diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs
index 9e78cc259ce..dd0c14dae23 100644
--- a/src/debuginfo/mod.rs
+++ b/src/debuginfo/mod.rs
@@ -20,7 +20,7 @@ use crate::prelude::*;
 
 pub(crate) fn producer() -> String {
     format!(
-        "cg_clif (rustc {}, cranelift {})",
+        "rustc version {} with cranelift {}",
         rustc_interface::util::rustc_version_str().unwrap_or("unknown version"),
         cranelift_codegen::VERSION,
     )