luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Convert relocs_check to a shell script using grep

Browse Source 
This runs a bit faster and removes another use of perl from
the kernel build.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-By: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Stephen Rothwell 2015-03-18 16:46:16 +11:00 committed by Michael Ellerman
parent e4a9616c54
commit a71aa05e14
3 changed files with 61 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/Makefile
View File

@ -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

66
arch/powerpc/relocs_check.pl
View File

@ -1,66 +0,0 @@
#!/usr/bin/perl
# Copyright © 2009 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.
use strict;
use warnings;
if ($#ARGV != 1) {
die "$0 [path to objdump] [path to vmlinux]\n";
}
# Have Kbuild supply the path to objdump so we handle cross compilation.
my $objdump = shift;
my $vmlinux = shift;
my $bad_relocs_count = 0;
my $bad_relocs = "";
my $old_binutils = 0;
open(FD, "$objdump -R $vmlinux|") or die;
while (<FD>) {
study $_;
# Only look at relocation lines.
next if (!/\s+R_/);
# These relocations are okay
# On PPC64:
# R_PPC64_RELATIVE, R_PPC64_NONE, R_PPC64_ADDR64
# On PPC:
# R_PPC_RELATIVE, R_PPC_ADDR16_HI,
# R_PPC_ADDR16_HA,R_PPC_ADDR16_LO,
# R_PPC_NONE
next if (/\bR_PPC64_RELATIVE\b/ or /\bR_PPC64_NONE\b/ or
/\bR_PPC64_ADDR64\s+mach_/);
next if (/\bR_PPC_ADDR16_LO\b/ or /\bR_PPC_ADDR16_HI\b/ or
/\bR_PPC_ADDR16_HA\b/ or /\bR_PPC_RELATIVE\b/ or
/\bR_PPC_NONE\b/);
# If we see this type of relocation it's an idication that
# we /may/ be using an old version of binutils.
if (/R_PPC64_UADDR64/) {
$old_binutils++;
}
$bad_relocs_count++;
$bad_relocs .= $_;
}
if ($bad_relocs_count) {
print "WARNING: $bad_relocs_count bad relocations\n";
print $bad_relocs;
}
if ($old_binutils) {
print "WARNING: You need at least binutils >= 2.19 to build a ".
"CONFIG_RELOCATABLE kernel\n";
}

59
arch/powerpc/relocs_check.sh Executable file
View File

@ -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