From 73e1e09b8e83ad6bbfb051bbbd8c5094c5f9c7b8 Mon Sep 17 00:00:00 2001
From: Rob Savoye <rob@cygnus>
Date: Wed, 3 Nov 1993 18:15:18 +0000
Subject: [PATCH] 	* config/udi.exp,unix.exp: Transform tool name. 
 * binutils.all/*.exp: Clear errorInfo after exec.

---
 binutils/testsuite/config/udi.exp  | 26 +++++++++++++++++---------
 binutils/testsuite/config/unix.exp | 26 +++++++++++++++++---------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/binutils/testsuite/config/udi.exp b/binutils/testsuite/config/udi.exp
index d71e3e9c283..29ea0d861b2 100644
--- a/binutils/testsuite/config/udi.exp
+++ b/binutils/testsuite/config/udi.exp
@@ -21,15 +21,23 @@
 
 load_lib util-defs.exp
 
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
+if ![info exists NM] then {
+    set NM [transform nm]
+}
+if ![info exists NMFLAGS] then {
+    set NMFLAGS ""
+}
+if ![info exists SIZE] then {
+    set SIZE [transform size]
+}
+if ![info exists SIZEFLAGS] then {
+    set SIZEFLAGS ""
+}
+if ![info exists OBJDUMP] then {
+    set OBJDUMP [transform objdump]
+}
+if ![info exists OBJDUMPFLAGS] then {
+    set OBJDUMPFLAGS ""
 }
 
 #
diff --git a/binutils/testsuite/config/unix.exp b/binutils/testsuite/config/unix.exp
index d71e3e9c283..29ea0d861b2 100644
--- a/binutils/testsuite/config/unix.exp
+++ b/binutils/testsuite/config/unix.exp
@@ -21,15 +21,23 @@
 
 load_lib util-defs.exp
 
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
+if ![info exists NM] then {
+    set NM [transform nm]
+}
+if ![info exists NMFLAGS] then {
+    set NMFLAGS ""
+}
+if ![info exists SIZE] then {
+    set SIZE [transform size]
+}
+if ![info exists SIZEFLAGS] then {
+    set SIZEFLAGS ""
+}
+if ![info exists OBJDUMP] then {
+    set OBJDUMP [transform objdump]
+}
+if ![info exists OBJDUMPFLAGS] then {
+    set OBJDUMPFLAGS ""
 }
 
 #
-- 
2.30.2