Fix false positive in `dwz` lines

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 0892cad25e345f0c830c58a929b4b54ebbac73f3..e84b12b5e6abf504810b0c943b7350507ac69df9 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -24,7 +24,7 @@ use warnings;
 use Getopt::Long ();
 use Text::ParseWords ();
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 
 # CONSTANTS/VARIABLES
@@ -53,7 +53,7 @@ my $cc_regex_normal = qr/
 my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/;
 # Regex to catch libtool commands and not lines which show commands executed
 # by libtool (e.g. libtool: link: ...).
-my $libtool_regex = qr/\blibtool\s.*--mode=/;
+my $libtool_regex = qr/\blibtool["']?\s.*--mode=/;
 my $libtool_link_regex = qr/\blibtool: link: /;
 
 # List of source file extensions which require preprocessing.
@@ -544,7 +544,7 @@ sub is_non_verbose_build {
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;
     # "Compiling" non binary files.
-    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|el)['"]?\s*(?:\.\.\.)?$/;
+    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|pyx|el)['"]?\s*(?:\.\.\.|because it changed\.)?$/;
     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;
     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
@@ -792,13 +792,6 @@ foreach my $file (@ARGV) {
     my $harden_bindnow = $option_bindnow; # defaults to 0
     my $harden_pie     = $option_pie;     # defaults to 0
 
-    # Does this build log use ada? Ada also uses gcc as compiler but uses
-    # different CFLAGS. But only perform ada checks if an ada compiler is used
-    # for performance reasons.
-    my $ada = 0;
-    # Fortran also requires different CFLAGS.
-    my $fortran = 0;
-
     # Number of parallel jobs to prevent false positives when detecting
     # non-verbose builds. As not all jobs declare the number of parallel jobs
     # use a large enough default.
@@ -907,15 +900,6 @@ foreach my $file (@ARGV) {
                 }
                 next FILE;
             }
-
-            # Ada compiler.
-            if ($line =~ /\bgnat\b/) {
-                $ada = 1;
-            }
-            # Fortran compiler.
-            if ($line =~ /\bgfortran\b/) {
-                $fortran = 1;
-            }
         }
 
         # This flags is not always available, but if it is use it.
@@ -1077,6 +1061,7 @@ foreach my $file (@ARGV) {
             # look like a compiler executable thus causing the line to be
             # treated as a normal compiler line.
             next if $line =~ m{^\s*rm\s+};
+            next if $line =~ m{^\s*dwz\s+};
             # Some build systems emit "gcc > file".
             next if $line =~ m{$cc_regex_normal\s*>\s*\S+}o;
             # Hex output may contain "cc".
@@ -1213,19 +1198,15 @@ foreach my $file (@ARGV) {
     }
 
     # Ada doesn't support format hardening flags, see #680117 for more
-    # information. Same for fortran. Filter them out if either language is
-    # used.
+    # information. Same for fortran.
     my @cflags_backup;
-    my @cflags_noformat;
-    if (($ada or $fortran) and $harden_format) {
-        @cflags_noformat = grep {
-            my $ok = 1;
-            foreach my $flag (@def_cflags_format) {
-                $ok = 0 if $_ eq $flag;
-            }
-            $ok;
-        } @cflags;
-    }
+    my @cflags_noformat = grep {
+        my $ok = 1;
+        foreach my $flag (@def_cflags_format) {
+            $ok = 0 if $_ eq $flag;
+        }
+        $ok;
+    } @cflags;
 
     # Hack to fix cppflags_fortify_broken() if --ignore-flag
     # -D_FORTIFY_SOURCE=2 is used to ignore missing fortification. Only works
@@ -1367,16 +1348,14 @@ LINE:
                 and extension_found(\%extensions_compile_cpp, @extensions)) {
             $compile     = 0;
             $compile_cpp = 1;
-        # Ada needs special CFLAGS, use them if only ada files are compiled.
-        } elsif ($ada
-                and extension_found(\%extensions_ada, @extensions)) {
+        # Ada needs special CFLAGS
+        } elsif (extension_found(\%extensions_ada, @extensions)) {
             $restore_cflags = 1;
             $preprocess = 0; # Ada uses no CPPFLAGS
             @cflags_backup = @cflags;
             @cflags        = @cflags_noformat;
-        # Same for fortran.
-        } elsif ($fortran
-                and extension_found(\%extensions_fortran, @extensions)) {
+        # Same for fortran
+        } elsif (extension_found(\%extensions_fortran, @extensions)) {
             $restore_cflags = 1;
             @cflags_backup = @cflags;
             @cflags        = @cflags_noformat;