daily update

[external/binutils.git] / binutils / testsuite / config / default.exp

diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
index 4c8b6e0..01fd8cc 100644 (file)
--- a/binutils/testsuite/config/default.exp
+++ b/binutils/testsuite/config/default.exp
@@ -1,9 +1,9 @@
-#   Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2004
+#   Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2004, 2005, 2007, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -20,7 +20,6 @@
 
 # This file was written by Rob Savoye. (rob@cygnus.com)
 
-load_lib util-defs.exp
 load_lib utils-lib.exp
 
 if ![info exists NM] then {
@@ -62,6 +61,12 @@ if ![info exists READELF] then {
 if ![info exists READELFFLAGS] then {
     set READELFFLAGS ""
 }
+if ![info exists ELFEDIT] then {
+    set ELFEDIT [findfile $base_dir/elfedit]
+}
+if ![info exists ELFEDITFLAGS] then {
+    set ELFEDITFLAGS ""
+}
 if ![info exists WINDRES] then {
     set WINDRES [findfile $base_dir/windres]
 }
@@ -95,8 +100,14 @@ if {[file isfile ld/ld-new[exe_ext]]} then {
 } else {
     link_or_copy ld/ld-new ld[exe_ext]
 }
-set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
-set dlltool_gas_flag "-S [pwd]/tmpdir/gas/as[exe_ext]"
+if {[file isfile tmpdir/gas/as[exe_ext]]} then {
+    set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
+    set dlltool_gas_flag "-S [pwd]/tmpdir/gas/as[exe_ext]"
+} else {
+    # Testing an installed toolchain.
+    set gcc_gas_flag ""
+    set dlltool_gas_flag ""
+}
 
 #
 # binutils_run