From 48fc1b4a3287300f9f4de0d632d7eab088025356 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 11 May 2012 13:40:03 +0000 Subject: [PATCH 1/1] [backfire] scripts/remote-gdb: merge r23406, r23407 and r26885 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@31676 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/remote-gdb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/remote-gdb b/scripts/remote-gdb index 60efb9703..49cdd1e22 100755 --- 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); -- 2.35.1