* config/default.exp: Do not load libpath.exp if it does not

	exist.
	(CC): Provide fallback definition.
	(CFLAGS): Likewise.
	(CXX): Likewise.
	(CXXFLAGS): Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 04f2d450229fb027545bccf5ba9b00c8b962fb27..5aa3a95139ef6fd561b023578b7aa2ee3f761fb4 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-24  Mark Mitchell  <mark@codesourcery.com>
+
+       * config/default.exp: Do not load libpath.exp if it does not
+       exist.
+       (CC): Provide fallback definition.
+       (CFLAGS): Likewise.
+       (CXX): Likewise.
+       (CXXFLAGS): Likewise.
+       
 2005-03-23  Alan Modra  <amodra@bigpond.net.au>
 
        * ld-elf/tbss.s: Don't start directives in first column.

diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp
index b05ae0a10d53f0f6025e1cba41870e60c8808c0a..ad48cc744366730eb5b5e41842f3a9366d105c2d 100644 (file)
--- a/ld/testsuite/config/default.exp
+++ b/ld/testsuite/config/default.exp
@@ -70,10 +70,28 @@ if {![file isdirectory tmpdir/ld]} then {
 set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
 
 # load the linker path
-load_lib tmpdir/libpath.exp
+if {[file exists tmpdir/libpath.exp]} {
+    load_lib tmpdir/libpath.exp
 
-foreach dir $libpath {
-    set gcc_ld_flag "$gcc_ld_flag -L$dir"
+    foreach dir $libpath {
+       set gcc_ld_flag "$gcc_ld_flag -L$dir"
+    }
+}
+
+# "CC=$(CC_FOR_TARGET)", and other similar parameters.  But, if the
+# user invokes runtest directly (as when testing an installed linker),
+# these flags may not be set.
+if {![info exists CC]} {
+    set CC [find_gcc]
+}
+if {![info exists CFLAGS]} {
+    set CFLAGS "-g -O2"
+}
+if {![info exists CXX]} {
+    set CXX [find_g++]
+}
+if {![info exists CXXFLAGS]} {
+    set CXXFLAGS ""
 }
 
 # The mips64-*-linux-gnu compiler defaults to the N32 ABI after