[backfire] scripts/remote-gdb: merge r23406, r23407 and r26885

SVN-Revision: 31676

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 60efb9703fc8d4239da3611d6a2e5ded2d5cd6d1..49cdd1e22c5a8180fe9184d66a7306d0d0cd52ab 100755 (executable)
--- a/scripts/remote-gdb
+++ b/scripts/remote-gdb
@@ -14,7 +14,7 @@ if( opendir SD, "$Bin/../staging_dir" )
 {
        my ( $tid, $arch, $libc, @arches );
 
-       if( $ARGV[1] =~ m!\btarget-([^_/]+)_([^_/]+)\b! )
+       if( $ARGV[1] =~ m!\btarget-(.+?)_([^_]+libc[^_/]+)\b!i )
        {
                print("Using target $1 ($2)\n");
                ($arch, $libc) = ($1, $2);
@@ -26,7 +26,7 @@ if( opendir SD, "$Bin/../staging_dir" )
 
                while( defined( my $e = readdir SD ) )
                {
-                       if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-([^_]+)_([^_]+)/ )
+                       if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_([^_]+libc[^_]+)/i )
                        {
                                push @arches, [ $1, $2 ];
                                printf(" %2d) %s (%s)\n", @arches + 0, $1, $2);
@@ -52,8 +52,7 @@ if( opendir SD, "$Bin/../staging_dir" )
        closedir SD;
 
        # Find gdb
-       my ($gdb) = glob("$Bin/../build_dir/toolchain-${arch}_*_${libc}/gdb-*/gdb/gdb");
-
+       my ($gdb) = glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}*/bin/*-gdb");
        if( defined($gdb) && -x $gdb )
        {
                my ( $fh, $fp ) = tempfile();
@@ -64,7 +63,8 @@ if( opendir SD, "$Bin/../staging_dir" )
                print $fh "set sysroot $sysroot\n" if $sysroot;
                print $fh "target remote $ARGV[0]\n";
 
-               system($gdb, '-x', $fp, $ARGV[1]);
+               my $file = -f "$sysroot/$ARGV[1]" ? "$sysroot/$ARGV[1]" : $ARGV[1];
+               system($gdb, '-x', $fp, $file);
 
                close($fh);
                unlink($fp);