diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /scripts/remote-gdb | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'scripts/remote-gdb')
| -rwxr-xr-x | scripts/remote-gdb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/remote-gdb b/scripts/remote-gdb index a470ac71d..380a22511 100755 --- a/scripts/remote-gdb +++ b/scripts/remote-gdb @@ -6,7 +6,7 @@ use FindBin '$Bin'; use File::Temp 'tempfile'; @ARGV == 2 || do { - die "Usage: $0 <host:port> <executable>\n"; + die "Usage: $0 <corefile|host:port> <executable>\n"; exit 1; }; @@ -14,7 +14,7 @@ if( opendir SD, "$Bin/../staging_dir" ) { my ( $tid, $arch, $libc, @arches ); - if( $ARGV[1] =~ m!\btarget-(.+?)_([^_]+libc[^/]+)\b!i ) + if( $ARGV[1] =~ m!\btarget-(.+?)_(([^_]+libc|musl)[^/]+)\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-(.+?)_([^_]+libc.+)/i ) + if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_(([^_]+.libc|musl)+)/i ) { push @arches, [ $1, $2 ]; printf(" %2d) %s (%s)\n", @arches + 0, $1, $2); @@ -61,7 +61,9 @@ if( opendir SD, "$Bin/../staging_dir" ) my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/"); print $fh "set sysroot $sysroot\n" if $sysroot; - print $fh "target remote $ARGV[0]\n"; + my $cmd = "target remote"; + -f $ARGV[0] and $cmd = "core-file"; + print $fh "$cmd $ARGV[0]\n"; my $file = -f "$sysroot/$ARGV[1]" ? "$sysroot/$ARGV[1]" : $ARGV[1]; system($gdb, '-x', $fp, $file); |