[tip:tracing/urgent] tracing/x86: Derive arch from bits argument in recordmcount.pl

[tip-bot for Jan Kiszka]

Commit-ID:  b82a4045f7962483a78a874343dc6e31b79c96c1
Gitweb:     http://git.kernel.org/tip/b82a4045f7962483a78a874343dc6e31b79c96c1
Author:     Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
AuthorDate: Mon, 11 Jan 2010 11:31:44 +0100
Committer:  Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Mon, 11 Jan 2010 23:49:35 -0500

tracing/x86: Derive arch from bits argument in recordmcount.pl

Let the arch argument be overruled by bits. Otherwise, building of
external modules against a i386 target on a x86-64 host (and likely vice
versa as well) fails unless ARCH=i386 is explicitly passed to make.

Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
LKML-Reference: <4B4AFE10.8050109@xxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
 scripts/recordmcount.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 92f09fe..ea6f6e3 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -194,7 +194,7 @@ sub check_objcopy
     }
 }
 
-if ($arch eq "x86") {
+if ($arch =~ /(x86(_64)?)|(i386)/) {
     if ($bits == 64) {
 	$arch = "x86_64";
     } else {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/