Skip to content

Commit

Permalink
powerpc: Convert relocs_check to a shell script using grep
Browse files Browse the repository at this point in the history
This runs a bit faster and removes another use of perl from
the kernel build.

Signed-off-by: Stephen Rothwell <[email protected]>
Acked-By: Tony Breeds <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
  • Loading branch information
sfrothwell authored and mpe committed Mar 23, 2015
1 parent e4a9616 commit a71aa05
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 68 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ boot := arch/$(ARCH)/boot

ifeq ($(CONFIG_RELOCATABLE),y)
quiet_cmd_relocs_check = CALL $<
cmd_relocs_check = perl $< "$(OBJDUMP)" "$(obj)/vmlinux"
cmd_relocs_check = $(CONFIG_SHELL) $< "$(OBJDUMP)" "$(obj)/vmlinux"

PHONY += relocs_check
relocs_check: arch/powerpc/relocs_check.pl vmlinux
relocs_check: arch/powerpc/relocs_check.sh vmlinux
$(call cmd,relocs_check)

zImage: relocs_check
Expand Down
66 changes: 0 additions & 66 deletions arch/powerpc/relocs_check.pl

This file was deleted.

59 changes: 59 additions & 0 deletions arch/powerpc/relocs_check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/sh

# Copyright © 2015 IBM Corporation

# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.

# This script checks the relocations of a vmlinux for "suspicious"
# relocations.

# based on relocs_check.pl
# Copyright © 2009 IBM Corporation

if [ $# -lt 2 ]; then
echo "$0 [path to objdump] [path to vmlinux]" 1>&2
exit 1
fi

# Have Kbuild supply the path to objdump so we handle cross compilation.
objdump="$1"
vmlinux="$2"

bad_relocs=$(
"$objdump" -R "$vmlinux" |
# Only look at relocation lines.
grep -E '\<R_' |
# These relocations are okay
# On PPC64:
# R_PPC64_RELATIVE, R_PPC64_NONE
# R_PPC64_ADDR64 mach_<name>
# On PPC:
# R_PPC_RELATIVE, R_PPC_ADDR16_HI,
# R_PPC_ADDR16_HA,R_PPC_ADDR16_LO,
# R_PPC_NONE
grep -F -w -v 'R_PPC64_RELATIVE
R_PPC64_NONE
R_PPC_ADDR16_LO
R_PPC_ADDR16_HI
R_PPC_ADDR16_HA
R_PPC_RELATIVE
R_PPC_NONE' |
grep -E -v '\<R_PPC64_ADDR64[[:space:]]+mach_'
)

if [ -z "$bad_relocs" ]; then
exit 0
fi

num_bad=$(echo "$bad_relocs" | wc -l)
echo "WARNING: $num_bad bad relocations"
echo "$bad_relocs"

# If we see this type of relocation it's an idication that
# we /may/ be using an old version of binutils.
if echo "$bad_relocs" | grep -q -F -w R_PPC64_UADDR64; then
echo "WARNING: You need at least binutils >= 2.19 to build a CONFIG_RELOCATABLE kernel"
fi

0 comments on commit a71aa05

Please sign in to comment.