diff mbox

powerpc: comvert relocs_check to a shell script using grep

Message ID 20150312151009.18077d0c@canb.auug.org.au (mailing list archive)
State Changes Requested
Delegated to: Michael Ellerman
Headers show

Commit Message

Stephen Rothwell March 12, 2015, 4:10 a.m. UTC 
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>
---
 arch/powerpc/Makefile        |  4 +--
 arch/powerpc/relocs_check.pl | 66 --------------------------------------------
 arch/powerpc/relocs_check.sh | 58 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 68 deletions(-)
 delete mode 100755 arch/powerpc/relocs_check.pl
 create mode 100755 arch/powerpc/relocs_check.sh

Comments

Michael Ellerman March 12, 2015, 6:15 a.m. UTC | #1 
On Thu, 2015-03-12 at 15:10 +1100, Stephen Rothwell wrote:
> 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>
> ---
>  arch/powerpc/Makefile        |  4 +--
>  arch/powerpc/relocs_check.pl | 66 --------------------------------------------
>  arch/powerpc/relocs_check.sh | 58 ++++++++++++++++++++++++++++++++++++++

Always good to see less Perl!

ShellCheck says:

   1  #!/bin/sh
   2  
   3  # Copyright © 2015 IBM Corporation
   4  
   5  # This program is free software; you can redistribute it and/or
   6  # modify it under the terms of the GNU General Public License
   7  # as published by the Free Software Foundation; either version
   8  # 2 of the License, or (at your option) any later version.
   9  
  10  # This script checks the relocations of a vmlinux for "suspicious"
  11  # relocations.
  12  
  13  # based on relocs_check.pl
  14  # Copyright © 2009 IBM Corporation
  15  
  16  if [ ${#*} -lt 2 ]; then
  17         printf "%s [path to objdump] [path to vmlinux]\n" $0 1>&2
                                                               ^––SC2086 Double quote to prevent globbing and word splitting.
  							       https://github.com/koalaman/shellcheck/wiki/SC2086

  18         exit 1
  19  fi
  20  
  21  # Have Kbuild supply the path to objdump so we handle cross compilation.
  22  objdump="$1"
  23  vmlinux="$2"
  24  
  25  bad_relocs=$(
  26  "$objdump" -R "$vmlinux" |
  27         # Only look at relocation lines.
  28         grep -E '\<R_' |
  29         # These relocations are okay
  30         # On PPC64:
  31         #       R_PPC64_RELATIVE, R_PPC64_NONE
  32         #       R_PPC64_ADDR64 mach_<name>
  33         # On PPC:
  34         #       R_PPC_RELATIVE, R_PPC_ADDR16_HI,
  35         #       R_PPC_ADDR16_HA,R_PPC_ADDR16_LO,
  36         #       R_PPC_NONE
  37         grep -F -w -v 'R_PPC64_RELATIVE
  38  R_PPC64_NONE
  39  R_PPC_ADDR16_LO
  40  R_PPC_ADDR16_HI
  41  R_PPC_ADDR16_HA
  42  R_PPC_RELATIVE
  43  R_PPC_NONE' |
  44         grep -E -v '\<R_PPC64_ADDR64[[:space:]]+mach_'
  45  )
  46  
  47  if [ -z "$bad_relocs" ]; then
  48         exit 0
  49  fi
  50  
  51  printf "WARNING: %d bad relocations\n" $(printf "$bad_relocs\n" | wc -l)
                                             ^––SC2046 Quote this to prevent word splitting.
					     https://github.com/koalaman/shellcheck/wiki/SC2046
                                                      ^––SC2059 Don't use variables in the printf format string. Use printf "..%s.." "$foo".
						      https://github.com/koalaman/shellcheck/wiki/SC2059
  52  printf "$bad_relocs\n"
             ^––SC2059 Don't use variables in the printf format string. Use printf "..%s.." "$foo".
	     https://github.com/koalaman/shellcheck/wiki/SC2059
  53  
  54  # If we see this type of relocation it's an idication that
  55  # we /may/ be using an old version of binutils.
  56  if echo "$bad_relocs\n" | grep -q -F -w R_PPC64_UADDR64; then
                          ^––SC2028 echo won't expand escape sequences. Consider printf.
			  https://github.com/koalaman/shellcheck/wiki/SC2028
  57         printf "WARNING: You need at least binutils >= 2.19 to build a CONFIG_RELOCATABLE kernel\n"
  58  fi
  59
diff mbox

Patch

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 132d9c681d6a..1e868023b2c3 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -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
diff --git a/arch/powerpc/relocs_check.pl b/arch/powerpc/relocs_check.pl
deleted file mode 100755
index 3f46e8b9c56d..000000000000
--- a/arch/powerpc/relocs_check.pl
+++ /dev/null
@@ -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";
-}
diff --git a/arch/powerpc/relocs_check.sh b/arch/powerpc/relocs_check.sh
new file mode 100755
index 000000000000..8747dd9f7202
--- /dev/null
+++ b/arch/powerpc/relocs_check.sh
@@ -0,0 +1,58 @@ 
+#!/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
+	printf "%s [path to objdump] [path to vmlinux]\n" $0 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
+
+printf "WARNING: %d bad relocations\n" $(printf "$bad_relocs\n" | wc -l)
+printf "$bad_relocs\n"
+
+# 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\n" | grep -q -F -w R_PPC64_UADDR64; then
+	printf "WARNING: You need at least binutils >= 2.19 to build a CONFIG_RELOCATABLE kernel\n"
+fi