From: tip-bot for Jan Kiszka <jan.kiszka@siemens.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
rostedt@goodmis.org, jan.kiszka@siemens.com, tglx@linutronix.de
Subject: [tip:tracing/urgent] tracing/x86: Derive arch from bits argument in recordmcount.pl
Date: Sat, 16 Jan 2010 09:42:38 GMT [thread overview]
Message-ID: <tip-b82a4045f7962483a78a874343dc6e31b79c96c1@git.kernel.org> (raw)
In-Reply-To: <4B4AFE10.8050109@siemens.com>
Commit-ID: b82a4045f7962483a78a874343dc6e31b79c96c1
Gitweb: http://git.kernel.org/tip/b82a4045f7962483a78a874343dc6e31b79c96c1
Author: Jan Kiszka <jan.kiszka@siemens.com>
AuthorDate: Mon, 11 Jan 2010 11:31:44 +0100
Committer: Steven Rostedt <rostedt@goodmis.org>
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@siemens.com>
LKML-Reference: <4B4AFE10.8050109@siemens.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
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 {
prev parent reply other threads:[~2010-01-16 9:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-11 10:31 [PATCH] recordmcount.pl: x86: Derive arch from bits argument Jan Kiszka
2010-01-16 9:42 ` tip-bot for Jan Kiszka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b82a4045f7962483a78a874343dc6e31b79c96c1@git.kernel.org \
--to=jan.kiszka@siemens.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).