diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-12 01:15:55 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-12 01:15:55 +0000 |
commit | ad903bf464948e03c76b4145c99f9f2bb6e9c06a (patch) | |
tree | 42119dd219a5fec1ef3929c284dfed1e4bc53b4a | |
parent | a3acb8ddf473d9984b45822b8364b37000786ddf (diff) |
[scripts] remote-gdb:
- fix parsing of arch-libc tuples
- automatically add sysroot to executable if needed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23406 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | scripts/remote-gdb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/remote-gdb b/scripts/remote-gdb index 60efb9703..95529fc84 100755 --- a/scripts/remote-gdb +++ b/scripts/remote-gdb @@ -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,7 +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 ) { @@ -64,7 +64,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); |