summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-01-11 11:31:44 +0100
committerSteven Rostedt <rostedt@goodmis.org>2010-01-11 23:49:35 -0500
commitb82a4045f7962483a78a874343dc6e31b79c96c1 (patch)
treeacb339f05f72d149f7fb7d262a6e30bdcc24b4cc /scripts
parentff2576674c19c4b74acc4f6cc9bac3b94916350b (diff)
downloadop-kernel-dev-b82a4045f7962483a78a874343dc6e31b79c96c1.zip
op-kernel-dev-b82a4045f7962483a78a874343dc6e31b79c96c1.tar.gz
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@siemens.com> LKML-Reference: <4B4AFE10.8050109@siemens.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/recordmcount.pl2
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 {
OpenPOWER on IntegriCloud