Sync architecture specific hardening support with dpkg 1.22.0

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index ed0011ff8a67da1f53cd0cb308ed3ea1be6dd75f..5bbcae73a63cbbebaef4a7096f6a253224ebb38b 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -1153,11 +1153,12 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.21.13
-        # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_build_flags()),
-        # copyright Raphaël Hertzog <hertzog@debian.org>, Guillem Jover
-        # <guillem@debian.org>, Kees Cook <kees@debian.org>, Canonical, Ltd.
-        # licensed under GPL version 2 or later. Keep it in sync.
+        # The following was partially copied from dpkg-dev 1.22.0
+        # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, set_build_features and
+        # _add_build_flags()), copyright Raphaël Hertzog <hertzog@debian.org>,
+        # Guillem Jover <guillem@debian.org>, Kees Cook <kees@debian.org>,
+        # Canonical, Ltd. licensed under GPL version 2 or later. Keep it in
+        # sync.
 
         require Dpkg::Arch;
         my ($os, $cpu);
@@ -1174,13 +1175,23 @@ foreach my $file (@ARGV) {
             arm64
             armel
             armhf
+            hurd-amd64
             hurd-i386
             i386
             kfreebsd-amd64
             kfreebsd-i386
             mips
-            mipsel
+            mips64
             mips64el
+            mips64r6
+            mips64r6el
+            mipsel
+            mipsn32
+            mipsn32el
+            mipsn32r6
+            mipsn32r6el
+            mipsr6
+            mipsr6el
             powerpc
             ppc64
             ppc64el
@@ -1191,15 +1202,14 @@ foreach my $file (@ARGV) {
         );
 
         # Disable unsupported hardening options.
-        if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/
-                or $cpu =~ /^(?:hppa|avr32)$/) {
+        if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/ or $cpu eq 'hppa') {
             $harden_pie = 0;
         }
         if ($cpu =~ /^(?:ia64|alpha|hppa|nios2)$/ or $arch eq 'arm') {
             $harden_stack = 0;
             $harden_stack_strong = 0;
         }
-        if ($cpu =~ /^(?:ia64|hppa|avr32)$/) {
+        if ($cpu =~ /^(?:ia64|hppa)$/) {
             $harden_relro   = 0;
             $harden_bindnow = 0;
         }