X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=a6cb190dea75797765adc38fa1613bc1e27736b2;hb=640b00ae26577c67685b80964e1811294c156d5c;hp=0892cad25e345f0c830c58a929b4b54ebbac73f3;hpb=0798b6d8fc65dd5fe2a975789dea153a96dcac89;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 0892cad..a6cb190 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -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.
@@ -1213,19 +1197,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 +1347,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;