Re-enable hardening on hppa

The corresponding GCC bug is apparently fixed.

2 files changed, 2 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f799969b..702b7c2ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ openssh (1:8.1p1-1) UNRELEASED; urgency=medium
       heap allocators.
     - sshd(8): In the Linux seccomp-bpf sandbox, allow the s390-specific
       ioctl for ECC hardware support.
+  * Re-enable hardening on hppa, since the corresponding GCC bug is
+    apparently fixed.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 09 Oct 2019 23:18:42 +0100
 
diff --git a/debian/rules b/debian/rules
index c8b778dc0..d1f282d11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,11 +65,6 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
 confflags += --with-libs=-lcrypt
 endif
 
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
-ifeq ($(DEB_HOST_ARCH),hppa)
-confflags += --without-hardening
-endif
-
 # Everything above here is common to the deb and udeb builds.
 confflags_udeb := $(confflags)