From efe113047d765b26869c3170c43678dd561027b4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 11 Nov 2021 01:23:10 -0500
Subject: [PATCH] sim: testsuite: drop sim_compile cover function

Most code isn't using this, and the only call site (in one cris file)
can use target_compile directly.  So switch it over to simplify.
---
 sim/testsuite/cris/c/c.exp     |  2 +-
 sim/testsuite/lib/sim-defs.exp | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp
index 08ea18812ec..26084682dc9 100644
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@@ -189,7 +189,7 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
     verbose -log "Compiling $src with $opts(cc)"
 
     set dest "$opts(dest)"
-    if { [sim_compile $src $dest "executable" "$opts(cc)" ] != "" } {
+    if { [target_compile $src $dest "executable" "$opts(cc)" ] != "" } {
 	unresolved $testname
 	continue
     }
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 6e8feaf6bf8..7bc4c66549e 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -35,19 +35,6 @@ proc sim_version {} {
     clone_output "$sim_path $version\n"
 }
 
-# Cover function to target_compile.
-# Copied from gdb_compile.
-
-proc sim_compile { source dest type options } {
-    set result [target_compile $source $dest $type $options]
-    regsub "\[\r\n\]*$" "$result" "" result
-    regsub "^\[\r\n\]*" "$result" "" result
-    if { $result != "" } {
-	clone_output "sim compile output: $result"
-    }
-    return $result
-}
-
 # Find the path to the simulator for executing.
 proc sim_tool_path {} {
     global sim_path
-- 
2.30.2