diff options
| author | Stephen Rothwell | 2020-08-12 00:04:32 +1000 |
|---|---|---|
| committer | Michael Ellerman | 2020-09-02 11:00:22 +1000 |
| commit | b84eaab6ede6477484edc043456cf7d7cfc7f8b3 (patch) | |
| tree | 022347a8e91090d086cc7cee8cf3453030c9c2b2 | |
| parent | 3d97abbc9f6fe90973551f3e3eef47ffef863114 (diff) | |
powerpc: unrel_branch_check.sh: simplify and tidy up the final loop
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200811140435.20957-6-sfr@canb.auug.org.au
| -rwxr-xr-x | arch/powerpc/tools/unrel_branch_check.sh | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh index dc82289b2252..54ebd05615d4 100755 --- a/arch/powerpc/tools/unrel_branch_check.sh +++ b/arch/powerpc/tools/unrel_branch_check.sh @@ -25,7 +25,6 @@ $objdump -R -d --start-address="$kstart" --stop-address="$kend" "$vmlinux" | awk '$2 == "<__end_interrupts>:" { print $1 }' ) -BRANCHES=$( $objdump -R -D --no-show-raw-insn --start-address="$kstart" --stop-address="$end_intr" "$vmlinux" | sed -E -n ' # match lines that start with a kernel address @@ -45,24 +44,19 @@ sed -E -n ' # strip out condition registers s/:0xcr[0-7],/:0x/ p -}' -) - -for tuple in $BRANCHES; do - from=$(echo "$tuple" | cut -d':' -f1) - branch=$(echo "$tuple" | cut -d':' -f2) - to=$(echo "$tuple" | cut -d':' -f3) - sym=$(echo "$tuple" | cut -d':' -f4) +}' | { +all_good=true +while IFS=: read -r from branch to sym; do if (( to > end_intr )); then - if [ -z "$bad_branches" ]; then - echo "WARNING: Unrelocated relative branches" - bad_branches="yes" + if $all_good; then + printf '%s\n' 'WARNING: Unrelocated relative branches' + all_good=false fi - echo "$from $branch-> $to $sym" + printf '%s %s-> %s %s\n' "$from" "$branch" "$to" "$sym" fi done -if [ -z "$bad_branches" ]; then - exit 0 -fi +$all_good + +} |