2005-07-04 Mark Mitchell <mark@codesourcery.com>

        * Makefile.am (site.exp): Set tmpdir.
        * Makefile.in: Regenerated.
        * testsuite/lib/checkoutput.exp (newlib_check_output): Put
        executables in $tmpdir.
        * testsuite/lib/flags.exp (libgloss_link_flags): Use the original
        libgloss version if not running in the build directory.
        * testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
        $tmpdir.
        * testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
        in $tmpdir.

4 files changed, 14 insertions, 6 deletions

diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp
index 8cb4692..4bf7438 100644
--- a/newlib/testsuite/lib/checkoutput.exp
+++ b/newlib/testsuite/lib/checkoutput.exp
@@ -9,10 +9,10 @@
 # It assumes one line of output per test.
 
 proc newlib_check_output { srcfile expectlist } {
-    global objdir subdir srcdir
+    global subdir srcdir tmpdir
 
     set srcfullname "$srcdir/$subdir/$srcfile"
-    set test_driver "$objdir/testsuite/[file tail [file rootname $srcfullname].x]"
+    set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
 
     set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]
 
diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
index f6bffde..ebc6928 100644
--- a/newlib/testsuite/lib/flags.exp
+++ b/newlib/testsuite/lib/flags.exp
@@ -12,12 +12,20 @@
 # directories, rather than in the build and source paths of the
 # compiler being used.
 
+if {![llength [info procs saved_libgloss_link_flags]]} {
+    rename libgloss_link_flags saved_libgloss_link_flags
+}
+
 proc libgloss_link_flags { args } {
     global target_cpu
     # These values come from the local site.exp.
     global srcdir objdir
     global multibuildtop
 
+    if {![info exists multibuildtop]} {
+	return [saved_libgloss_link_flags $args]
+    }
+
     verbose "In newlib version of libgloss_link_flags...\n"
 
     if [isnative] {
diff --git a/newlib/testsuite/lib/newlib.exp b/newlib/testsuite/lib/newlib.exp
index c53a8a8..f1df40e 100644
--- a/newlib/testsuite/lib/newlib.exp
+++ b/newlib/testsuite/lib/newlib.exp
@@ -23,7 +23,7 @@ proc newlib_init { args } {
     global newlib_initialized
     global target_info
     # These values are initialized in the local site.exp file.
-    global srcdir objdir
+    global srcdir objdir tmpdir
     global host_triplet target_triplet
     global old_ld_library_path
 
@@ -34,7 +34,7 @@ proc newlib_init { args } {
     if {[target_info needs_status_wrapper] != "" && \
 	    [target_info needs_status_wrapper] != "0" && \
 	    ![info exists gluefile]} {
-	set gluefile ${objdir}/testsuite/testglue.o;
+	set gluefile ${tmpdir}/testglue.o;
 	set result [build_wrapper $gluefile];
 	if { $result != "" } {
 	    set gluefile [lindex $result 0];
diff --git a/newlib/testsuite/lib/passfail.exp b/newlib/testsuite/lib/passfail.exp
index 82dc009..3532c8b 100644
--- a/newlib/testsuite/lib/passfail.exp
+++ b/newlib/testsuite/lib/passfail.exp
@@ -32,11 +32,11 @@ proc newlib_pass_fail_all { flag exclude_list } {
 # compiles and runs.
 
 proc newlib_pass_fail { srcfile } {
-    global srcdir objdir subdir
+    global srcdir tmpdir subdir
 
     set fullsrcfile "$srcdir/$subdir/$srcfile"
 
-    set test_driver "$objdir/testsuite/[file rootname $srcfile].x"
+    set test_driver "$tmpdir/[file rootname $srcfile].x"
 
     set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]