Fix scripts/namespace.pl portability
PATCH 1/1 Fix scripts/namespace.pl portability
scripts/namespace.pl was assuming the nm and objdump tools to use are always just named that which breaks things in a crosscompilation environment.
Fixed by honouring $NM and $OBJDUMP if passed by make, otherwise defaulting to just nm rsp. objdump just as we used to.
--- scripts/namespace.pl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
scripts/namespace.pl +8 -2
@@ -66,8 +66,14 @@ require 5; # at least perl 5 use strict; use File::Find; -my $nm = "/usr/bin/nm -p"; -my $objdump = "/usr/bin/objdump -s -j .comment"; +my $nm = "nm"; +$nm = "$ENV{'NM'}" if (exists($ENV{'NM'})); +$nm = "$nm" . " -p"; +my $objdump = "objdump"; + +$objdump = "$ENV{'OBJDUMP'}" if (exists($ENV{'OBJDUMP'})); +$objdump = $objdump . " -s -j .comment"; + my $srctree = ""; my $objtree = ""; $srctree = "$ENV{'srctree'}/" if (exists($ENV{'srctree'}));
Quoted 8 lines · Ralf Baechle
scripts/namespace.plwas assuming the nm and objdump tools to use are always just named that which breaks things in a crosscompilation environment.Fixed by honouring $NM and $OBJDUMP if passed by make, otherwise defaulting to just nm rsp. objdump just as we used to.
Signed-off-by Ralf Baechle <[email protected]>
Atsushi Nemoto pointed me to http://lkml.org/lkml/2005/9/20/68. This old patch which seems more complete than mine but made it into the kernel.
I just refreshed the patch and added the bits to ensure namespace.pl
uses the right nm binary also - Keith's original patch only fixed the objdump use.
From: Keith Owens <[email protected]>
Those scripts are meant to work even when they are invoked by hand, without OBJDUMP being defined in the environment. This is the correct fix.
--- scripts/namespace.pl | 16 ++++++++++++++-- scripts/reference_discarded.pl | 10 ++++++++-- scripts/reference_init.pl | 10 ++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-)
scripts/namespace.pl +14 -2
@@ -66,12 +66,24 @@ require 5; # at least perl 5 use strict; use File::Find; -my $nm = "/usr/bin/nm -p"; -my $objdump = "/usr/bin/objdump -s -j .comment"; my $srctree = ""; my $objtree = ""; $srctree = "$ENV{'srctree'}/" if (exists($ENV{'srctree'})); $objtree = "$ENV{'objtree'}/" if (exists($ENV{'objtree'})); +my $nm; +if (exists($ENV{'NM'})) { + $nm = $ENV{'NM'}; +} else { + $nm = 'nm'; +} +$nm .= ' -p'; +my $objdump; +if (exists($ENV{'OBJDUMP'})) { + $objdump = $ENV{'OBJDUMP'}; +} else { + $objdump = 'objdump'; +} +$objdump .= ' -s -j .comment'; if ($#ARGV != -1) { print STDERR "usage: $0 takes no parameters\n";
scripts/reference_discarded.pl +8 -2
@@ -14,11 +14,17 @@ my $object; my $line; my $ignore; my $errorcount; +my $objdump; +if (exists($ENV{'OBJDUMP'})) { + $objdump = $ENV{'OBJDUMP'}; +} else { + $objdump = 'objdump'; +} $| = 1; # printf("Finding objects, "); -open(OBJDUMP_LIST, "find . -name '*.o' | xargs objdump -h |") || die "getting objdump list failed"; +open(OBJDUMP_LIST, "find . -name '*.o' | xargs $objdump -h |") || die "getting objdump list failed"; while (defined($line = <OBJDUMP_LIST>)) { chomp($line); if ($line =~ /:\s+file format/) {
@@ -79,7 +85,7 @@ foreach $object (keys(%object)) { $errorcount = 0; foreach $object (keys(%object)) { my $from; - open(OBJDUMP, "objdump -r $object|") || die "cannot objdump -r $object"; + open(OBJDUMP, "$objdump -r $object|") || die "cannot objdump -r $object"; while (defined($line = <OBJDUMP>)) { chomp($line); if ($line =~ /RELOCATION RECORDS FOR /) {
scripts/reference_init.pl +8 -2
@@ -22,11 +22,17 @@ my %object; my $object; my $line; my $ignore; +my $objdump; +if (exists($ENV{'OBJDUMP'})) { + $objdump = $ENV{'OBJDUMP'}; +} else { + $objdump = 'objdump'; +} $| = 1; printf("Finding objects, "); -open(OBJDUMP_LIST, "find . -name '*.o' | xargs objdump -h |") || die "getting objdump list failed"; +open(OBJDUMP_LIST, "find . -name '*.o' | xargs $objdump -h |") || die "getting objdump list failed"; while (defined($line = <OBJDUMP_LIST>)) { chomp($line); if ($line =~ /:\s+file format/) {
@@ -81,7 +87,7 @@ printf("ignoring %d conglomerate(s)\n", printf("Scanning objects\n"); foreach $object (sort(keys(%object))) { my $from; - open(OBJDUMP, "objdump -r $object|") || die "cannot objdump -r $object"; + open(OBJDUMP, "$objdump -r $object|") || die "cannot objdump -r $object"; while (defined($line = <OBJDUMP>)) { chomp($line); if ($line =~ /RELOCATION RECORDS FOR /) {
Quoted 17 lines · Ralf Baechle
Quoted 8 lines · Ralf Baechle
scripts/namespace.plwas assuming the nm and objdump tools to use are always just named that which breaks things in a crosscompilation environment.Fixed by honouring $NM and $OBJDUMP if passed by make, otherwise defaulting to just nm rsp. objdump just as we used to.
Signed-off-by Ralf Baechle <[email protected]>Atsushi Nemoto pointed me to http://lkml.org/lkml/2005/9/20/68. This old patch which seems more complete than mine but made it into the kernel.
I just refreshed the patch and added the bits to ensure namespace.pl
uses the right nm binary also - Keith's original patch only fixed the objdump use.
Quoted 5 lines
From: Keith Owens <[email protected]>
Those scripts are meant to work even when they are invoked by hand, without OBJDUMP being defined in the environment. This is the correct fix.
Hi Ralf. In my kbuild tree I have this fixed already:
my $nm = ($ENV{'NM'} || "nm") . " -p";
my $objdump = ($ENV{'OBJDUMP'} || "objdump") . " -s -j .comment";
Patch is from Aaron Brooks.
The reference_init.pl + reference_discarded.pl are subject for removal since the check has been moved to modpost.
Sam