[gcc-6] 227/401: * Configure with --enable-default-pie and pass -z now when pie is enabled; on amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x. Closes: #835148.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 1f184ca659190a4eb049f598babf7ebe47ae7f59
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Oct 11 06:31:15 2016 +0000

      * Configure with --enable-default-pie and pass -z now when pie is enabled;
        on amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x.
        Closes: #835148.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8999 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                                             |  5 ++++-
 ...{bind_now_when_pie-ubuntu.diff => bind_now_when_pie.diff} |  0
 debian/rules.defs                                            | 12 ++++++++----
 debian/rules.patch                                           | 11 +++++++++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5716d72..0e7451d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,14 @@ gcc-6 (6.2.0-7) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Backport Mips go closure support, taken from libffi. Closes: #839132.
+  * Configure with --enable-default-pie and pass -z now when pie is enabled;
+    on amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x.
+    Closes: #835148.
 
   [ Aurelien Jarno ]
   * Enable logwatch on mips64el.
 
- -- Matthias Klose <doko at debian.org>  Mon, 10 Oct 2016 06:36:35 +0200
+ -- Matthias Klose <doko at debian.org>  Tue, 11 Oct 2016 08:27:46 +0200
 
 gcc-6 (6.2.0-6) unstable; urgency=medium
 
diff --git a/debian/patches/bind_now_when_pie-ubuntu.diff b/debian/patches/bind_now_when_pie.diff
similarity index 100%
rename from debian/patches/bind_now_when_pie-ubuntu.diff
rename to debian/patches/bind_now_when_pie.diff
diff --git a/debian/rules.defs b/debian/rules.defs
index e857ac1..c3506b7 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1260,16 +1260,20 @@ endif
 
 # pie by default --------------------
 with_pie :=
-ifeq ($(distribution),Ubuntu)
+ifeq ($(distribution),Debian)
+  ifeq (,$(filter $(distrelease),wheezy squeeze jessie))
+    pie_archs = amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x
+  endif
+else ifeq ($(distribution),Ubuntu)
   ifeq (,$(filter $(distrelease),lucid precise trusty utopic vivid wily))
     pie_archs = s390x
   endif
   ifeq (,$(filter $(distrelease),lucid precise trusty utopic vivid wily xenial))
     pie_archs += amd64 ppc64el
   endif
-  ifneq (,$(filter $(DEB_TARGET_ARCH),$(pie_archs)))
-    with_pie := yes
-  endif
+endif
+ifneq (,$(filter $(DEB_TARGET_ARCH),$(pie_archs)))
+  with_pie := yes
 endif
 
 # gold --------------------
diff --git a/debian/rules.patch b/debian/rules.patch
index e449898..194fae1 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -117,7 +117,14 @@ ifeq ($(with_ssp)-$(with_ssp_default),yes-yes)
     hardening_patches += gcc-default-ssp-strong
   endif
 endif
-ifeq ($(distribution),Ubuntu)
+ifeq ($(distribution),Debian)
+  ifneq (,$(findstring gcc-6, $(PKGSOURCE)))
+    ifeq ($(with_pie),yes)
+      hardening_patches += \
+	bind_now_when_pie
+    endif
+  endif
+else ifeq ($(distribution),Ubuntu)
   ifneq (,$(findstring gcc-6, $(PKGSOURCE)))
     hardening_patches += \
 	gcc-default-fortify-source \
@@ -128,7 +135,7 @@ ifeq ($(distribution),Ubuntu)
 	testsuite-glibc-warnings
     ifeq ($(with_pie),yes)
       hardening_patches += \
-	bind_now_when_pie-ubuntu
+	bind_now_when_pie
     endif
   endif
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git