X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=bfa954b50f2b8974ee1dbd06e855f5ee8ef668ee;hp=a188c899d775fa742c55758cf260e44bae6690ea;hb=36c9f05a7471f321df247f0237ac8efa81d69207;hpb=573f74bd5133b4ef514c977814955942a91a3614

diff --git a/bin/blhc b/bin/blhc
index a188c89..bfa954b 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -31,9 +31,16 @@ our $VERSION = '0.01';
 # CONSTANTS/VARIABLES
 
 # Regex to catch compiler commands.
-my $cc_regex = qr/(?:[a-z0-9_]+-(?:linux-|kfreebsd-)?gnu(?:eabi|eabihf)?-)?
-                  (?<!\.)(?:cc|gcc|g\+\+|c\+\+)
-                  (?:-[\d.]+)?/x;
+my $cc_regex = qr/
+    (?<!\.)(?:cc|gcc|g\+\+|c\+\+)
+    (?:-[\d.]+)?
+    /x;
+# Full regex which matches the complete compiler name. Used in a few places to
+# prevent false negatives.
+my $cc_regex_full = qr/
+    (?:[a-z0-9_]+-(?:linux-|kfreebsd-)?gnu(?:eabi|eabihf)?-)?
+    $cc_regex
+    /x;
 # Regex to catch (GCC) compiler warnings.
 my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
 
@@ -165,8 +172,7 @@ my @def_cflags_pie = (
     '-fPIE',
 );
 my @def_cxxflags = (
-    '-g',
-    '-O(?:2|3)',
+    @def_cflags,
 );
 # @def_cxxflags_* is the same as @def_cflags_*.
 my @def_cppflags = ();
@@ -184,7 +190,12 @@ my @def_ldflags_pie = (
     '-fPIE',
     '-pie',
 );
-# Renaming rules for the output so the regex parts are not visible.
+my @def_ldflags_pic = (
+    '-fPIC',
+    '-fpic',
+);
+# Renaming rules for the output so the regex parts are not visible. Also
+# stores string values of flag regexps above, see compile_flag_regexp().
 my %flag_renames = (
     '-O(?:2|3)'       => '-O2',
     '-Wl,(-z,)?relro' => '-Wl,-z,relro',
@@ -200,12 +211,10 @@ my $option_color;
 sub error_flags {
     my ($message, $missing_flags_ref, $flag_renames_ref, $line) = @_;
 
-    # Rename flags if requested.
+    # Get string value of qr//-escaped regexps and if requested rename them.
     my @missing_flags = map {
-        (exists $flag_renames_ref->{$_})
-            ? $flag_renames_ref->{$_}
-            : $_
-    } @{$missing_flags_ref};
+            $flag_renames_ref->{$_}
+        } @{$missing_flags_ref};
 
     my $flags = join ' ', @missing_flags;
     printf "%s (%s)%s %s",
@@ -240,7 +249,7 @@ sub any_flags_used {
     my ($line, @flags) = @_;
 
     foreach my $flag (@flags) {
-        return 1 if $line =~ /\s$flag(?:\s|\\)/;
+        return 1 if $line =~ /$flag/;
     }
 
     return 0;
@@ -250,7 +259,7 @@ sub all_flags_used {
 
     my @missing_flags = ();
     foreach my $flag (@flags) {
-        if ($line !~ /\s$flag(?:\s|\\)/) {
+        if (not $line =~ /$flag/) {
             push @missing_flags, $flag;
         }
     }
@@ -266,7 +275,7 @@ sub pic_pie_conflict {
     my ($line, $pie, $missing_flags_ref, @flags_pie) = @_;
 
     return 0 if not $pie;
-    return 0 if not any_flags_used($line, ('-fPIC', '-fpic'));
+    return 0 if not any_flags_used($line, @def_ldflags_pic);
 
     my %flags = map { $_ => 1 } @flags_pie;
 
@@ -308,7 +317,7 @@ sub is_non_verbose_build {
     if (defined $file) {
         # Get filename, we can't use the complete path as only parts of it are
         # used in the real compiler command.
-        $file =~ m{/([a-zA-Z0-9._-]+)$};
+        $file =~ m{/([^/\s]+)$};
         $file = $1;
 
         if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/o) {
@@ -322,6 +331,24 @@ sub is_non_verbose_build {
     return 1;
 }
 
+sub compile_flag_regexp {
+    my ($flag_renames_ref, @flags) = @_;
+
+    my @result = ();
+    foreach my $flag (@flags) {
+        # Store flag name in replacement string for correct flags in messages
+        # with qr//ed flag regexps.
+        $flag_renames_ref->{qr/\s$flag(?:\s|\\)/}
+            = (exists $flag_renames_ref->{$flag})
+                ? $flag_renames_ref->{$flag}
+                : $flag;
+
+        # Compile flag regexp for faster execution.
+        push @result, qr/\s$flag(?:\s|\\)/;
+    }
+    return @result;
+}
+
 sub extension_found {
     my ($extensions_ref, @extensions) = @_;
 
@@ -390,6 +417,22 @@ if ($option_all) {
     $option_bindnow = 1;
 }
 
+# Precompile all flag regexps. any_flags_used(), all_flags_used() get a lot
+# faster with this.
+@def_cflags           = compile_flag_regexp(\%flag_renames, @def_cflags);
+@def_cflags_format    = compile_flag_regexp(\%flag_renames, @def_cflags_format);
+@def_cflags_fortify   = compile_flag_regexp(\%flag_renames, @def_cflags_fortify);
+@def_cflags_stack     = compile_flag_regexp(\%flag_renames, @def_cflags_stack);
+@def_cflags_pie       = compile_flag_regexp(\%flag_renames, @def_cflags_pie);
+@def_cxxflags         = compile_flag_regexp(\%flag_renames, @def_cxxflags);
+@def_cppflags         = compile_flag_regexp(\%flag_renames, @def_cppflags);
+@def_cppflags_fortify = compile_flag_regexp(\%flag_renames, @def_cppflags_fortify);
+@def_ldflags          = compile_flag_regexp(\%flag_renames, @def_ldflags);
+@def_ldflags_relro    = compile_flag_regexp(\%flag_renames, @def_ldflags_relro);
+@def_ldflags_bindnow  = compile_flag_regexp(\%flag_renames, @def_ldflags_bindnow);
+@def_ldflags_pie      = compile_flag_regexp(\%flag_renames, @def_ldflags_pie);
+@def_ldflags_pic      = compile_flag_regexp(\%flag_renames, @def_ldflags_pic);
+
 # Final exit code.
 my $exit = 0;
 
@@ -518,10 +561,10 @@ FILE: foreach my $file (@ARGV) {
                         and $line =~ /^(?:checking|(?:C|c)onfigure:) /;
                 next if $line =~ /^\s*(?:Host\s+)?(?:C\s+)?
                                    (?:C|c)ompiler[\s.]*:?\s+
-                                   $cc_regex
+                                   $cc_regex_full
                                    (?:\s-std=[a-z0-9:+]+)?\s*$
                                  /xo
-                        or $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex\s*$/o
+                        or $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o
                         or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: /
                         or $line =~ /^\s*(?:echo )?Using [A-Z_]+\s*=\s*/;
                 # `make` output.
@@ -612,6 +655,9 @@ FILE: foreach my $file (@ARGV) {
         # Remove everything until and including the compiler command. Makes
         # checks easier and faster.
         $line =~ s/^.*?$cc_regex//o;
+        # "([...] test.c)" is not detected as 'test.c' - fix this by removing
+        # the brace and similar characters.
+        $line =~ s/['")]+$//;
 
         # Skip unnecessary tests when only preprocessing.
         my $flag_preprocess = 0;