sync architecture specific hardening support with dpkg 1.17.13.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index be3fd3fb41c094d0612d8f2b4ffc2e147f2cc7df..9db9fe2aa98030158a74712278ea7f7636f4f303 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -214,7 +214,8 @@ my @def_cxxflags = (
 my @def_cppflags = ();
 my @def_cppflags_fortify = (
     '-D_FORTIFY_SOURCE=2', # must be first, see cppflags_fortify_broken()
-    # If you add another flag fix hack below (search for "Hack to fix").
+    # If you add another flag fix hack below (search for "Hack to fix") and
+    # $def_cppflags_fortify[0].
 );
 my @def_cppflags_fortify_bad = (
     # These flags may overwrite -D_FORTIFY_SOURCE=2.
@@ -999,9 +1000,6 @@ foreach my $file (@ARGV) {
             $harden_stack = 0;
             $harden_stack_strong = 0;
         }
-        if ($arch =~ /^(?:m68k|or1k|powerpcspe|sh4|x32)$/) {
-            $harden_stack_strong = 0;
-        }
         if ($cpu =~ /^(?:ia64|hppa|avr32)$/) {
             $harden_relro   = 0;
             $harden_bindnow = 0;
@@ -1213,6 +1211,7 @@ LINE:
         # for a debug build.
         if (any_flags_used($line, @def_cflags_debug)) {
             remove_flags([\@cflags], \%flag_renames, $def_cflags[1]);
+            remove_flags([\@cppflags], \%flag_renames, $def_cppflags_fortify[0]);
         }
 
         # Check hardening flags.