X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=f2f0d6f1253055d81c918f23ca64670c37826b51;hp=75888b86835469f3de4aa00898670084893f8801;hb=287e6f3e56eeed74465bada187f9f4b18c07eb91;hpb=e703305cc4c2d1717d6b63987d13951910b682ce diff --git a/bin/blhc b/bin/blhc index 75888b8..f2f0d6f 100755 --- a/bin/blhc +++ b/bin/blhc @@ -81,6 +81,12 @@ my @source_no_preprocess_compile_cpp = ( # Objective-C++ qw( mii ), ); +my @source_no_preprocess_compile_ada = ( + # Ada body + qw( adb ), + # If you add another file, fix use of @source_no_preprocess_compile_ada + # below (search for $compile_ada). +); my @source_no_preprocess_compile = ( # C qw( i ), @@ -90,8 +96,8 @@ my @source_no_preprocess_compile = ( qw( mi ), # Fortran qw( f for ftn f90 f95 f03 f08 ), - # Ada body - qw( adb ), + # Ada + @source_no_preprocess_compile_ada, ); my @source_no_preprocess_no_compile = ( # Assembly @@ -176,7 +182,7 @@ my @def_cflags = ( '-O(?:2|3)', ); my @def_cflags_format = ( - '-Wformat', + '-Wformat(?:=2)?', # -Wformat=2 implies -Wformat, accept it too '-Werror=format-security', # implies -Wformat-security ); my @def_cflags_fortify = ( @@ -184,7 +190,7 @@ my @def_cflags_fortify = ( ); my @def_cflags_stack = ( '-fstack-protector', - '--param=ssp-buffer-size=4', + '--param[= ]ssp-buffer-size=4', ); my @def_cflags_pie = ( '-fPIE', @@ -244,9 +250,11 @@ my @flag_refs_all = ( # 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', - '-Wl,(?:-z,)?now' => '-Wl,-z,now', + '-O(?:2|3)' => '-O2', + '-Wformat(?:=2)?' => '-Wformat', + '--param[= ]ssp-buffer-size=4' => '--param=ssp-buffer-size=4', + '-Wl,(?:-z,)?relro' => '-Wl,-z,relro', + '-Wl,(?:-z,)?now' => '-Wl,-z,now', ); my %exit_code = ( @@ -287,6 +295,20 @@ my $option_color; # FUNCTIONS +# Only works for single-level arrays with no undef values. Thanks to perlfaq4. +sub array_equal { + my ($first_ref, $second_ref) = @_; + + return 0 if scalar @{$first_ref} != scalar @{$second_ref}; + + my $length = scalar @{$first_ref}; + for (my $i = 0; $i < $length; $i++) { + return 0 if $first_ref->[$i] ne $second_ref->[$i]; + } + + return 1; +} + sub error_flags { my ($message, $missing_flags_ref, $flag_renames_ref, $line) = @_; @@ -299,6 +321,8 @@ sub error_flags { printf '%s (%s)%s %s', error_color($message, 'red'), $flags, error_color(':', 'yellow'), $line; + + return; } sub error_non_verbose_build { my ($line) = @_; @@ -307,6 +331,8 @@ sub error_non_verbose_build { error_color('NONVERBOSE BUILD', 'red'), error_color(':', 'yellow'), $line; + + return; } sub error_invalid_cmake { my ($version) = @_; @@ -315,12 +341,16 @@ sub error_invalid_cmake { error_color('INVALID CMAKE', 'red'), error_color(':', 'yellow'), $version; + + return; } sub error_hardening_wrapper { printf "%s%s %s\n", error_color('HARDENING WRAPPER', 'red'), error_color(':', 'yellow'), 'no checks possible, aborting'; + + return; } sub error_color { my ($message, $color) = @_; @@ -457,6 +487,8 @@ sub remove_flags { or not exists $removes{$flag_renames_ref->{$_}}) } @{$flags}; } + + return; } sub compile_flag_regexp { @@ -640,6 +672,11 @@ 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 used + # for performance reasons. + my $ada = 0; + while (my $line = <$fh>) { # Detect architecture automatically unless overridden. For buildd logs # only, doesn't use the dpkg-buildpackage header. Necessary to ignore @@ -686,7 +723,10 @@ foreach my $file (@ARGV) { } } - if (index($line, 'Build-Depends: ') == 0) { + # Debian's build daemons use Build-Depends: for the build + # dependencies, but pbuilder just uses Depends:; support both. + if (index($line, 'Build-Depends: ') == 0 + or index($line, 'Depends: ') == 0) { # If hardening wrapper is used (wraps calls to gcc and adds # hardening flags automatically) we can't perform any checks, # abort. @@ -699,6 +739,11 @@ foreach my $file (@ARGV) { } next FILE; } + + # Ada compiler. + if ($line =~ /\bgnat\b/) { + $ada = 1; + } } # We skip over unimportant lines at the beginning of the log to @@ -726,6 +771,13 @@ foreach my $file (@ARGV) { if (not $arch and index($line, 'dpkg-buildpackage: host architecture ') == 0) { $arch = substr $line, 37, -1; # -1 to ignore '\n' at the end + + # Old buildd logs use e.g. "host architecture is alpha", remove + # the "is", otherwise debarch_to_debtriplet() will not detect the + # architecture. + if (index($arch, 'is ') == 0) { + $arch = substr $arch, 3; + } } # Ignore compiler warnings for now. @@ -905,6 +957,22 @@ foreach my $file (@ARGV) { @ldflags = (@ldflags, @def_ldflags_bindnow); } + # Stores normal CFLAGS when @cflags_ada are temporarily used. + my @cflags_backup; + # Ada CFLAGS. + my @cflags_ada = @cflags; + # Ada doesn't support format hardening flags, see #680117 for more + # information. Filter them out if ada is used. + if ($ada and $harden_format) { + @cflags_ada = 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 # as long as @def_cppflags_fortify contains only one variable. @@ -1029,13 +1097,22 @@ LINE: } } + my $compile_cpp = 0; + my $compile_ada = 0; # Assume CXXFLAGS are required when a C++ file is specified in the # compiler line. - my $compile_cpp = 0; if ($compile 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 $compile + and array_equal(\@extensions, + \@source_no_preprocess_compile_ada)) { + $compile_ada = 1; + @cflags_backup = @cflags; + @cflags = @cflags_ada; } if ($option_buildd) { @@ -1100,6 +1177,11 @@ LINE: $statistics{link_missing}++; } } + + # Restore normal CFLAGS. + if ($compile_ada) { + @cflags = @cflags_backup; + } } }