From b93f3dc742c0fa8d16f130938b56feb48e5bd7d7 Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Tue, 10 Jan 2012 18:22:18 -0600
Subject: Clean up objdump error messages.

Change-Id: I8f1022826a5a8c89aad0d3ffa97257f54804c711
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/608
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/build/tools/addCopyright.pl |  2 +-
 src/build/tools/genlist         | 30 ++++++++++++++++++++++++++++++
 src/build/tools/gensyms         |  8 ++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/build/tools/addCopyright.pl b/src/build/tools/addCopyright.pl
index bf7ac5811..b8f713a66 100755
--- a/src/build/tools/addCopyright.pl
+++ b/src/build/tools/addCopyright.pl
@@ -252,7 +252,7 @@ sub filetype
     if ( ( $filename =~ m/\.pl$/ )
        ||( $filename =~ m/\.perl$/ )
        ||( $filename =~ m/\.pm$/ )
-       ||( $fileinfo =~ m/perl.*script text executable/i) )
+       ||( $fileinfo =~ m/perl.*script.*text executable/i) )
     {
         return "Perl";
     }
diff --git a/src/build/tools/genlist b/src/build/tools/genlist
index 281dc6114..a3386e55c 100755
--- a/src/build/tools/genlist
+++ b/src/build/tools/genlist
@@ -1,4 +1,26 @@
 #!/usr/bin/perl
+#  IBM_PROLOG_BEGIN_TAG
+#  This is an automatically generated prolog.
+#
+#  $Source: src/build/tools/genlist $
+#
+#  IBM CONFIDENTIAL
+#
+#  COPYRIGHT International Business Machines Corp. 2011 - 2012
+#
+#  p1
+#
+#  Object Code Only (OCO) source materials
+#  Licensed Internal Code Source Materials
+#  IBM HostBoot Licensed Internal Code
+#
+#  The source code for this program is not published or other-
+#  wise divested of its trade secrets, irrespective of what has
+#  been deposited with the U.S. Copyright Office.
+#
+#  Origin: 30
+#
+#  IBM_PROLOG_END
 
 use strict;
 
@@ -147,6 +169,14 @@ my @symbol_sorted_addrs = sort { $a <=> $b} keys %symbol_address;
 
 foreach my $module (@modules)
 {
+    # Only search modules that are likely to be ELF files.
+    if (not (($module =~ m/\.o/) or
+             ($module =~ m/\.elf/) or
+             ($module =~ m/\.so/)))
+    {
+        next;
+    }
+
     print "BEGIN MODULE ---- ".$module." ----\n";
     my $enabled = 0;
     my $sections = 0;
diff --git a/src/build/tools/gensyms b/src/build/tools/gensyms
index f6f3911d0..69cdde622 100755
--- a/src/build/tools/gensyms
+++ b/src/build/tools/gensyms
@@ -85,6 +85,14 @@ while (my $modline = <MODINFO>)
 my @output = ();
 foreach my $module (@modules)
 {
+    # Only search modules that are likely to be ELF files.
+    if (not (($module =~ m/\.o/) or
+             ($module =~ m/\.elf/) or
+             ($module =~ m/\.so/)))
+    {
+        next;
+    }
+
     open OBJDUMP, ("ppc64-mcp6-objdump --syms -C ".add_image_subdir($module)."|");
     while (my $line = <OBJDUMP>)
     {
-- 
cgit v1.2.1