[Reproducible-commits] [dpkg] 04/63: Dpkg::Vendor::Debian: Do not enable stack-protector on nios2

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit ba511d919ea9bfe727fefb897a5503be93f1cade
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Jan 30 09:37:05 2016 +0100

    Dpkg::Vendor::Debian: Do not enable stack-protector on nios2
    
    This gcc target does not support stack-protector.
    
    Acked-by: Marek Vasut <marex at denx.de>
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog              | 2 ++
 scripts/Dpkg/Vendor/Debian.pm | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18e9ae6..2f99dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
     dpkg git repository, copyright format URL and examples in man pages among
     others.
   * Clarify where to find the GPL-2 license in debian/copyright.
+  * Do not enable stack-protector on nios2 in Debian and derivatives (it is
+    not supported by gcc yet).
   * Perl modules:
     - Add new CTRL_REPO_RELEASE control block type to Dpkg::Control.
     - Add new CTRL_COPYRIGHT_HEADER, CTRL_COPYRIGHT_FILES and
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index db40b2c..bf47144 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -262,8 +262,8 @@ sub _add_hardening_flags {
 	#  (#574716).
 	$use_feature{pie} = 0;
     }
-    if ($cpu =~ /^(?:ia64|alpha|hppa)$/ or $arch eq 'arm') {
-	# Stack protector disabled on ia64, alpha, hppa.
+    if ($cpu =~ /^(?:ia64|alpha|hppa|nios2)$/ or $arch eq 'arm') {
+	# Stack protector disabled on ia64, alpha, hppa, nios2.
 	#   "warning: -fstack-protector not supported for this target"
 	# Stack protector disabled on arm (ok on armel).
 	#   compiler supports it incorrectly (leads to SEGV)

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