projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: move the madwifi segfault fix to the right place
[openwrt.git]
/
scripts
/
remote-gdb
diff --git
a/scripts/remote-gdb
b/scripts/remote-gdb
index 60efb9703fc8d4239da3611d6a2e5ded2d5cd6d1..aad23e3246ad6feb441c9ecbb593f36899f7a1cb 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 );
{
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);
{
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 ) )
{
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);
{
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
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 )
{
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";
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);
close($fh);
unlink($fp);