--- ../_clean/gcc/testsuite/g++.dg/compat/struct-layout-1.exp	2013-01-10 22:26:54.000000000 +0100
+++ gcc/testsuite/g++.dg/compat/struct-layout-1.exp	2013-10-24 17:11:54.000000000 +0200
@@ -155,12 +155,18 @@ if { $status == 0 } then {
 
 	    compat-execute $src $sid $use_alt
 	}
+	file delete $generator
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force $generator.dSYM}
+	}
     } else {
 	warning "Could not execute g++.dg/compat/struct-layout-1 generator"
     }
 } else {
     warning "Could not compile g++.dg/compat/struct-layout-1 generator"
 }
+catch {file delete -force "g++.dg-struct-layout-1"}
 
 # Restore the original compiler under test.
 compat-use-tst-compiler
--- ../_clean/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp	2013-01-10 22:26:37.000000000 +0100
+++ gcc/testsuite/gcc.dg/compat/struct-layout-1.exp	2013-10-24 17:11:54.000000000 +0200
@@ -119,12 +119,18 @@ if { $status == 0 } then {
 
 	    compat-execute $src $sid $compat_use_alt
 	}
+	file delete $generator
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force $generator.dSYM}
+	}
     } else {
 	warning "Could not execute gcc.dg/compat/struct-layout-1 generator"
     }
 } else {
     warning "Could not compile gcc.dg/compat/struct-layout-1 generator"
 }
+catch {file delete -force "gcc.dg-struct-layout-1"}
 
 # Restore the original compiler under test.
 compat-use-tst-compiler
--- ../_clean/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp	2013-01-10 22:26:55.000000000 +0100
+++ gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp	2013-10-24 17:11:54.000000000 +0200
@@ -60,13 +60,18 @@ if { $status == 0 } then {
 
             dg-runtest $src "" $DEFAULT_CFLAGS
         }
+	file delete $generator
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force $generator.dSYM}
+	}
     } else {
         warning "Could not execute objc.dg/gnu-encoding/struct-layout-encoding-1 generator"
     }
 } else {
     warning "Could not compile objc.dg/gnu-encoding/struct-layout-encoding-1 generator"
 }
-
+catch {file delete -force "objc.dg-struct-layout-encoding-1"}
 
 
 
--- ../_clean/gcc/testsuite/lib/c-torture.exp	2013-01-10 22:26:33.000000000 +0100
+++ gcc/testsuite/lib/c-torture.exp	2013-10-24 17:11:54.000000000 +0200
@@ -249,6 +249,10 @@ proc c-torture-execute { sources args } 
         }
 	$status "$testcase execution, $option"
 	set oldstatus $status
+        # Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force -- $execname.dSYM}
+	}
     }
     if [info exists status] {
 	if { $status == "pass" } {
--- ../_clean/gcc/testsuite/lib/fortran-torture.exp	2013-01-10 22:26:33.000000000 +0100
+++ gcc/testsuite/lib/fortran-torture.exp	2013-10-24 17:11:54.000000000 +0200
@@ -335,6 +335,10 @@ proc fortran-torture-execute { src } {
 	$status "$testcase execution, $option"
     }
     cleanup-modules ""
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- [file rootname [file tail $src]].x.dSYM}
+    }
 }
 
 
--- ../_clean/gcc/testsuite/lib/gcc-dg.exp	2013-04-17 12:21:18.000000000 +0200
+++ gcc/testsuite/lib/gcc-dg.exp	2013-10-24 17:11:54.000000000 +0200
@@ -759,6 +759,11 @@ if { [info procs saved-dg-test] == [list
 	if [info exists testname_with_flags] {
 	    unset testname_with_flags
 	}
+        # Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	   catch {file delete -force -- \
+		       [file rootname [file tail [lindex $args 0]]].exe.dSYM}
+	}
     }
 }
 
--- ../_clean/gcc/testsuite/lib/lto.exp	2013-01-10 22:26:32.000000000 +0100
+++ gcc/testsuite/lib/lto.exp	2013-10-24 17:11:54.000000000 +0200
@@ -585,6 +585,10 @@ proc lto-execute { src1 sid } {
 	if {$sid eq "f_lto"} {
 	    cleanup-modules ""
 	}
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } { 
+	    catch {file delete -force -- $execname.dSYM}
+	}
     }
 }
 
--- ../_clean/gcc/testsuite/lib/objc-torture.exp	2013-01-10 22:26:33.000000000 +0100
+++ gcc/testsuite/lib/objc-torture.exp	2013-10-24 17:11:54.000000000 +0200
@@ -304,6 +304,10 @@ proc objc-torture-execute { src args } {
 	}
 	$status "$testcase execution, $option"
 	set oldstatus $status
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force -- $execname.dSYM}
+	}
     # for each option
     } 
     # tidy up
--- ../_clean/gcc/testsuite/lib/plugin-support.exp	2013-08-07 09:10:11.000000000 +0200
+++ gcc/testsuite/lib/plugin-support.exp	2013-10-24 17:11:54.000000000 +0200
@@ -129,4 +129,9 @@ proc plugin-test-execute { plugin_src pl
 
     # Clean up
     remote_file build delete $plugin_lib
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- $plugin_lib.dSYM}
+    }
+
 }
--- ../_clean/gcc/testsuite/lib/profopt.exp	2013-01-10 22:26:32.000000000 +0100
+++ gcc/testsuite/lib/profopt.exp	2013-10-24 17:11:54.000000000 +0200
@@ -332,6 +332,10 @@ proc profopt-execute { src } {
 	}
 
 	remote_file build delete $execname1
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force $execname1.dSYM}
+	}
 
 	# Quit for this round if it failed
 	if { $status != "pass" } {
@@ -374,6 +378,10 @@ proc profopt-execute { src } {
 	if { $status != "pass" } {
 	    continue
 	}
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	    catch {file delete -force $execname2.dSYM}
+	}
 
 	# If the test is not expected to produce performance data then
 	# we're done now.
--- ../_clean/gcc/testsuite/lib/target-supports.exp	2013-10-30 10:15:08.000000000 +0100
+++ gcc/testsuite/lib/target-supports.exp	2013-11-01 08:23:24.000000000 +0100
@@ -85,6 +85,10 @@ proc check_compile {basename type conten
 	set scan_output "[glob $src.\[0-9\]\[0-9\]\[0-9\]r.$rtl_type]"
 	file delete $output
     }
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- $output.dSYM}
+    }
 
     return [list $lines $scan_output]
 }
--- ../_clean/libjava/testsuite/lib/libjava.exp	2011-04-12 11:07:19.000000000 +0200
+++ libjava/testsuite/lib/libjava.exp	2013-10-24 18:50:24.000000000 +0200
@@ -310,6 +310,11 @@ proc gcj_cleanup {args} {
 	}
 	file delete -force -- $file
 	verbose "removing $file"
+        # Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	   catch {file delete -force -- [file rootname $file].exe.dSYM}
+	   catch {file delete -force -- [file rootname $file].dSYM}
+	}
     }
     # It is simplest to do this instead of trying to figure out what
     # bits in .libs ought to be removed.
@@ -747,11 +752,9 @@ proc test_libjava_from_source { options 
     if {[info exists opts(xfail-source-output)]} {
 	set opts(xfail-output) x
     }
-    if {[libjava_invoke $errname "source compiled test" opts $executable \
-	   $inpfile $resultfile ""]} {
-	# Everything ok, so clean up.
-	eval gcj_cleanup $removeList
-    }
+    catch {libjava_invoke $errname "source compiled test" opts $executable \
+	   $inpfile $resultfile ""}
+    eval gcj_cleanup $removeList
 }
 
 #
--- ../_clean/libjava/testsuite/libjava.loader/loader.exp	2011-04-12 11:07:20.000000000 +0200
+++ libjava/testsuite/libjava.loader/loader.exp	2013-10-24 17:11:54.000000000 +0200
@@ -71,6 +71,11 @@ proc gcj_loader_run {} {
 
   foreach x $srcfiles {
     gcj_loader_test_one $x
+    catch {file delete -force -- [file tail [file rootname $x]].exe}
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- [file tail [file rootname $x]].exe.dSYM}
+    }
   }
 }
 
--- ../_clean/libjava/testsuite/libjava.jar/jar.exp	2011-04-12 11:07:19.000000000 +0200
+++ libjava/testsuite/libjava.jar/jar.exp	2013-10-24 17:11:54.000000000 +0200
@@ -54,6 +54,12 @@ proc gcj_jar_run {} {
     if {$interp} {
       gcj_jar_interpret $jar
     }
+    catch {file delete [file tail [file rootname $jar]]}
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- [file tail [file rootname $jar]].dSYM}
+    }
+
   }
     # When we succeed we remove all our clutter.
     eval gcj_cleanup [glob -nocomplain -- ${main}.*] [list $main ]
--- ../_clean/libstdc++-v3/testsuite/lib/gdb-test.exp	2013-02-03 19:17:37.000000000 +0100
+++ libstdc++-v3/testsuite/lib/gdb-test.exp	2013-10-24 17:11:54.000000000 +0200
@@ -209,6 +209,11 @@ proc gdb-test { marker {selector {}} } {
 	}
     }
 
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } {
+	catch {file delete -force -- $output_file.dSYM}
+    }
+
     remote_close target
     unsupported "$testname"
     return
--- ../_clean/libstdc++-v3/testsuite/lib/libstdc++.exp	2013-10-03 14:48:35.000000000 +0200
+++ libstdc++-v3/testsuite/lib/libstdc++.exp	2013-11-01 14:08:33.000000000 +0100
@@ -418,6 +418,11 @@ if { [info procs saved-dg-test] == [list
 	if [info exists testname_with_flags] {
 	    unset testname_with_flags
 	}
+	# Remove dSYM directory on darwin.
+	if { [istarget *-*-darwin*] } {
+	   catch {file delete -force -- \
+			[file rootname [file tail [lindex $args 0]]].exe.dSYM}
+	}
     }
 }
 
@@ -724,6 +729,10 @@ proc check_v3_target_fileio { } {
 	    # No error message, compilation succeeded.
 	    set result [${tool}_load "./$exe" "" ""]
 	    set status [lindex $result 0]
+	    # Remove dSYM directory on darwin.
+	    if { [istarget *-*-darwin*] } {
+		catch {file delete -force -- $exe.dSYM}
+	    }
 	    remote_file build delete $exe
 
 	    verbose "check_v3_target_fileio: status is <$status>" 2
@@ -790,6 +799,10 @@ proc check_v3_target_c_std { } {
 	    # No error message, compilation succeeded.
 	    set result [${tool}_load "./$exe" "" ""]
 	    set status [lindex $result 0]
+	    # Remove dSYM directory on darwin.
+	    if { [istarget *-*-darwin*] } {
+		catch {file delete -force -- $exe.dSYM}
+	    }
 	    remote_file build delete $exe
 
 	    verbose "check_v3_target_c_std: status is <$status>" 2
@@ -911,6 +924,11 @@ proc check_v3_target_namedlocale { args 
     if { $status == "pass" } {
       set et_namedlocale 1
     }
+    # Remove dSYM directory on darwin.
+    if { [istarget *-*-darwin*] } { 
+	catch {file delete -force -- $exe.dSYM}
+    }
+    file delete $exe
     return $et_namedlocale
 }