| From 592e1f47f21a18522ae09811120f4ac11e05b8c0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 24 Oct 2019 11:47:30 +1100 |
| Subject: powerpc/tools: Don't quote $objdump in scripts |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| [ Upstream commit e44ff9ea8f4c8a90c82f7b85bd4f5e497c841960 ] |
| |
| Some of our scripts are passed $objdump and then call it as |
| "$objdump". This doesn't work if it contains spaces because we're |
| using ccache, for example you get errors such as: |
| |
| ./arch/powerpc/tools/relocs_check.sh: line 48: ccache ppc64le-objdump: No such file or directory |
| ./arch/powerpc/tools/unrel_branch_check.sh: line 26: ccache ppc64le-objdump: No such file or directory |
| |
| Fix it by not quoting the string when we expand it, allowing the shell |
| to do the right thing for us. |
| |
| Fixes: a71aa05e1416 ("powerpc: Convert relocs_check to a shell script using grep") |
| Fixes: 4ea80652dc75 ("powerpc/64s: Tool to flag direct branches from unrelocated interrupt vectors") |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20191024004730.32135-1-mpe@ellerman.id.au |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/tools/relocs_check.sh | 2 +- |
| arch/powerpc/tools/unrel_branch_check.sh | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/powerpc/tools/relocs_check.sh b/arch/powerpc/tools/relocs_check.sh |
| index ec2d5c835170..d6c16e7faa38 100755 |
| --- a/arch/powerpc/tools/relocs_check.sh |
| +++ b/arch/powerpc/tools/relocs_check.sh |
| @@ -23,7 +23,7 @@ objdump="$1" |
| vmlinux="$2" |
| |
| bad_relocs=$( |
| -"$objdump" -R "$vmlinux" | |
| +$objdump -R "$vmlinux" | |
| # Only look at relocation lines. |
| grep -E '\<R_' | |
| # These relocations are okay |
| diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh |
| index 1e972df3107e..77114755dc6f 100755 |
| --- a/arch/powerpc/tools/unrel_branch_check.sh |
| +++ b/arch/powerpc/tools/unrel_branch_check.sh |
| @@ -18,14 +18,14 @@ vmlinux="$2" |
| #__end_interrupts should be located within the first 64K |
| |
| end_intr=0x$( |
| -"$objdump" -R "$vmlinux" -d --start-address=0xc000000000000000 \ |
| +$objdump -R "$vmlinux" -d --start-address=0xc000000000000000 \ |
| --stop-address=0xc000000000010000 | |
| grep '\<__end_interrupts>:' | |
| awk '{print $1}' |
| ) |
| |
| BRANCHES=$( |
| -"$objdump" -R "$vmlinux" -D --start-address=0xc000000000000000 \ |
| +$objdump -R "$vmlinux" -D --start-address=0xc000000000000000 \ |
| --stop-address=${end_intr} | |
| grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" | |
| grep -v '\<__start_initialization_multiplatform>' | |
| -- |
| 2.20.1 |
| |
