Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     "Liu, Changcheng" <changcheng.liu@intel.com>,
        Kate Stewart <kstewart@linuxfoundation.org>,
        NeilBrown <neilb@suse.com>, Thomas Gleixner <tglx@linutronix.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Andrew Morton" <akpm@linux-foundation.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.14 076/100] scripts/faddr2line: extend usage on
 generic arch
Thread-Topic: [PATCH AUTOSEL for 4.14 076/100] scripts/faddr2line: extend
 usage on generic arch
Thread-Index: AQHTlMnpNzynPNo47UmUBuqcVnYIOw==
Date:   Wed, 24 Jan 2018 04:15:04 +0000
Message-ID: <20180124041414.32065-76-alexander.levin@microsoft.com>
References: <20180124041414.32065-1-alexander.levin@microsoft.com>
In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 352d7332-01b9-45d9-fc3c-08d562e12c83
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:04.3241
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1078
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liu, Changcheng" <changcheng.liu@intel.com>

[ Upstream commit 95a87982541932503d3f59aba4c30b0bde0a6294 ]

When cross-compiling, fadd2line should use the binary tool used for the
target system, rather than that of the host.

Link: http://lkml.kernel.org/r/20171121092911.GA150711@sofia
Signed-off-by: Liu Changcheng <changcheng.liu@intel.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: NeilBrown <neilb@suse.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 scripts/faddr2line | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/scripts/faddr2line b/scripts/faddr2line
index 1f5ce959f596..39e07d8574dd 100755
--- a/scripts/faddr2line
+++ b/scripts/faddr2line
@@ -44,9 +44,16 @@
 set -o errexit
 set -o nounset
=20
+READELF=3D"${CROSS_COMPILE}readelf"
+ADDR2LINE=3D"${CROSS_COMPILE}addr2line"
+SIZE=3D"${CROSS_COMPILE}size"
+NM=3D"${CROSS_COMPILE}nm"
+
 command -v awk >/dev/null 2>&1 || die "awk isn't installed"
-command -v readelf >/dev/null 2>&1 || die "readelf isn't installed"
-command -v addr2line >/dev/null 2>&1 || die "addr2line isn't installed"
+command -v ${READELF} >/dev/null 2>&1 || die "readelf isn't installed"
+command -v ${ADDR2LINE} >/dev/null 2>&1 || die "addr2line isn't installed"
+command -v ${SIZE} >/dev/null 2>&1 || die "size isn't installed"
+command -v ${NM} >/dev/null 2>&1 || die "nm isn't installed"
=20
 usage() {
 	echo "usage: faddr2line <object file> <func+offset> <func+offset>..." >&2
@@ -69,10 +76,10 @@ die() {
 find_dir_prefix() {
 	local objfile=3D$1
=20
-	local start_kernel_addr=3D$(readelf -sW $objfile | awk '$8 =3D=3D "start_=
kernel" {printf "0x%s", $2}')
+	local start_kernel_addr=3D$(${READELF} -sW $objfile | awk '$8 =3D=3D "sta=
rt_kernel" {printf "0x%s", $2}')
 	[[ -z $start_kernel_addr ]] && return
=20
-	local file_line=3D$(addr2line -e $objfile $start_kernel_addr)
+	local file_line=3D$(${ADDR2LINE} -e $objfile $start_kernel_addr)
 	[[ -z $file_line ]] && return
=20
 	local prefix=3D${file_line%init/main.c:*}
@@ -104,7 +111,7 @@ __faddr2line() {
=20
 	# Go through each of the object's symbols which match the func name.
 	# In rare cases there might be duplicates.
-	file_end=3D$(size -Ax $objfile | awk '$1 =3D=3D ".text" {print $2}')
+	file_end=3D$(${SIZE} -Ax $objfile | awk '$1 =3D=3D ".text" {print $2}')
 	while read symbol; do
 		local fields=3D($symbol)
 		local sym_base=3D0x${fields[0]}
@@ -156,10 +163,10 @@ __faddr2line() {
=20
 		# pass real address to addr2line
 		echo "$func+$offset/$sym_size:"
-		addr2line -fpie $objfile $addr | sed "s; $dir_prefix\(\./\)*; ;"
+		${ADDR2LINE} -fpie $objfile $addr | sed "s; $dir_prefix\(\./\)*; ;"
 		DONE=3D1
=20
-	done < <(nm -n $objfile | awk -v fn=3D$func -v end=3D$file_end '$3 =3D=3D=
 fn { found=3D1; line=3D$0; start=3D$1; next } found =3D=3D 1 { found=3D0; =
print line, "0x"$1 } END {if (found =3D=3D 1) print line, end; }')
+	done < <(${NM} -n $objfile | awk -v fn=3D$func -v end=3D$file_end '$3 =3D=
=3D fn { found=3D1; line=3D$0; start=3D$1; next } found =3D=3D 1 { found=3D=
0; print line, "0x"$1 } END {if (found =3D=3D 1) print line, end; }')
 }
=20
 [[ $# -lt 2 ]] && usage
--=20
2.11.0