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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-b82a4045f7962483a78a874343dc6e31b79c96c1@git.kernel.org>
Date:	Sat, 16 Jan 2010 09:42:38 GMT
From:	tip-bot for Jan Kiszka <jan.kiszka@...mens.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	rostedt@...dmis.org, jan.kiszka@...mens.com, tglx@...utronix.de
Subject: [tip:tracing/urgent] tracing/x86: Derive arch from bits argument in recordmcount.pl

Commit-ID:  b82a4045f7962483a78a874343dc6e31b79c96c1
Gitweb:     http://git.kernel.org/tip/b82a4045f7962483a78a874343dc6e31b79c96c1
Author:     Jan Kiszka <jan.kiszka@...mens.com>
AuthorDate: Mon, 11 Jan 2010 11:31:44 +0100
Committer:  Steven Rostedt <rostedt@...dmis.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@...mens.com>
LKML-Reference: <4B4AFE10.8050109@...mens.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/