[PATCH v5 13/16] export_report: Rehabilitate script

[Matthew Maurer]

* modules.order has .o files when in a build dir, support this
* .mod.c source layout has changed, update regexes to match
* Add a stage 3, to be more robust against additional .mod.c content

Signed-off-by: Matthew Maurer <mmau...@google.com>
---
 scripts/export_report.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/export_report.pl b/scripts/export_report.pl
index feb3d5542a62..dcef915405f3 100755
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -55,6 +55,7 @@ sub collectcfiles {
     open my $fh, '< modules.order' or die "cannot open modules.order: $!\n";
     while (<$fh>) {
        s/\.ko$/.mod.c/;
+       s/\.o$/.mod.c/;
        push (@file, $_)
     }
     close($fh);
@@ -120,10 +121,14 @@ foreach my $thismod (@allcfiles) {
                        next;
                }
                if ($state == 1) {
-                       $state = 2 if ($_ =~ 
/__attribute__\(\(section\("__versions"\)\)\)/);
+                       $state = 2 if ($_ =~ /__used 
__section\("__versions"\)/);
                        next;
                }
                if ($state == 2) {
+                       if ( $_ =~ /};/ ) {
+                               $state = 3;
+                               next;
+                       }
                        if ( $_ !~ /0x[0-9a-f]+,/ ) {
                                next;
                        }
@@ -133,7 +138,7 @@ foreach my $thismod (@allcfiles) {
                        push(@{$MODULE{$thismod}} , $sym);
                }
        }
-       if ($state != 2) {
+       if ($state != 3) {
                warn "WARNING:$thismod is not built with CONFIG_MODVERSIONS 
enabled\n";
                $modversion_warnings++;
        }
-- 
2.46.1.824.gd892dcdcdd-goog