fix checkstack.pl arch detection

Eric Sandeen · torvalds · commit abddaec56ebb · 2008-07-25T10:53:27.000-07:00
uname -m was leaving a newline in $arch, and not passing the tests.

Also, printing the unknown arch on failure is probably helpful.

Signed-off-by: Eric Sandeen &lt;sandeen@redhat.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
@@ -36,6 +36,7 @@
 	my $arch = shift;
 	if ($arch eq "") {
 		$arch = `uname -m`;
+		chomp($arch);
 	}
 
 	$x	= "[0-9a-f]";	# hex character
@@ -91,7 +92,7 @@
 		#   0:   00 e8 38 01     LINK 0x4e0;
 		$re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
 	} else {
-		print("wrong or unknown architecture\n");
+		print("wrong or unknown architecture \"$arch\"\n");
 		exit
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`my $arch = shift;`
`37`	`37`	`if ($arch eq "") {`
`38`	`38`	$arch = `uname -m`;
	`39`	`+ chomp($arch);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`$x = "[0-9a-f]"; # hex character`
`@@ -91,7 +92,7 @@`
`91`	`92`	`# 0: 00 e8 38 01 LINK 0x4e0;`
`92`	`93`	`$re = qr/.[[:space:]]LINK[[:space:]](0x$x{1,8})/o;`
`93`	`94`	`} else {`
`94`		`- print("wrong or unknown architecture\n");`
	`95`	`+ print("wrong or unknown architecture \"$arch\"\n");`
`95`	`96`	`exit`
`96`	`97`	`}`
`97`	`98`	`}`