4 files changed, 11 insertions, 24 deletions

diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp
index 146f87b00..8cb46925f 100644
--- a/newlib/testsuite/lib/checkoutput.exp
+++ b/newlib/testsuite/lib/checkoutput.exp
@@ -9,19 +9,17 @@
 # It assumes one line of output per test.
 
 proc newlib_check_output { srcfile expectlist } {
-    global subdir srcdir tmpdir
+    global objdir subdir srcdir
 
     set srcfullname "$srcdir/$subdir/$srcfile"
-    set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
+    set test_driver "$objdir/testsuite/[file tail [file rootname $srcfullname].x]"
 
     set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]
 
     if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile output"
+	fail "Failed to compile $srcfile.\n"
 	return
     }
-    pass "$subdir/$srcfile compilation"
 
     set result [newlib_load $test_driver ""]
     set status [lindex $result 0]
@@ -32,12 +30,11 @@ proc newlib_check_output { srcfile expectlist } {
     foreach { expectedval } $expectlist {
 	set gotval [string trim [lindex $output_lines 0] "\r"]
 	if { ! [string match $expectedval $gotval] } {
-	    verbose -log "$subdir/$srcfile: Expected: $expectedval Got: $gotval "
-	    fail "$subdir/$srcfile output"
+	    fail "$srcfile: Expected: $expectedval Got: $gotval "
 	    return
 	}
 	set output_lines [lrange $output_lines 1 end]
     }
 
-    pass "$subdir/$srcfile output"
+    pass $srcfile
 }
diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
index ebc69286f..f6bffde1f 100644
--- a/newlib/testsuite/lib/flags.exp
+++ b/newlib/testsuite/lib/flags.exp
@@ -12,20 +12,12 @@
 # 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 f1df40e52..c53a8a819 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 tmpdir
+    global srcdir objdir
     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 ${tmpdir}/testglue.o;
+	set gluefile ${objdir}/testsuite/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 5e7eb21e7..82dc0093c 100644
--- a/newlib/testsuite/lib/passfail.exp
+++ b/newlib/testsuite/lib/passfail.exp
@@ -32,21 +32,19 @@ proc newlib_pass_fail_all { flag exclude_list } {
 # compiles and runs.
 
 proc newlib_pass_fail { srcfile } {
-    global srcdir tmpdir subdir
+    global srcdir objdir subdir
 
     set fullsrcfile "$srcdir/$subdir/$srcfile"
 
-    set test_driver "$tmpdir/[file rootname $srcfile].x"
+    set test_driver "$objdir/testsuite/[file rootname $srcfile].x"
 
     set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]
 
     if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile execution"
+	fail "Failed to compile $fullsrcfile.\n"
     } else {
-	pass "$subdir/$srcfile compilation"
 	set result [newlib_load $test_driver ""]
 	set status [lindex $result 0]
-	$status "$subdir/$srcfile execution"
+	$status "$fullsrcfile"
     }
 }