X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=scripts%2Fremote-gdb;h=99c9d386d3862fa2c0a35b71cdcce9febdd7f3e9;hb=4089df4f4b0da96034580907d726b3bab8b484b0;hp=49cdd1e22c5a8180fe9184d66a7306d0d0cd52ab;hpb=7b53059401bd7736d9aa30575a8edc3b77438a28;p=oweals%2Fopenwrt.git

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 49cdd1e22c..99c9d386d3 100755
--- a/scripts/remote-gdb
+++ b/scripts/remote-gdb
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
@@ -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);
@@ -58,10 +58,17 @@ if( opendir SD, "$Bin/../staging_dir" )
 		my ( $fh, $fp ) = tempfile();
 
 		# Find sysroot
-		my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/");
+		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 extended-remote";
+		-f $ARGV[0] and $cmd = "core-file";
+		print $fh "$cmd $ARGV[0]\n";
+
+		# History settings
+		print $fh "set history filename $Bin/../tmp/.gdb_history\n";
+		print $fh "set history size 100000000\n";
+		print $fh "set history save on\n";
 
 		my $file = -f "$sysroot/$ARGV[1]" ? "$sysroot/$ARGV[1]" : $ARGV[1];
 		system($gdb, '-x', $fp, $file);