[Glibc-bsd-commits] r5615 - in trunk/freebsd-buildutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-08 20:07:50 +0000 (Wed, 08 Oct 2014)
New Revision: 5615

Added:
   trunk/freebsd-buildutils/debian/patches/hppa.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
Do not use -fstack-protector on hppa/parisc arch (thanks, Helge
Deller) (Closes: #758377)


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-10-08 20:05:48 UTC (rev 5614)
+++ trunk/freebsd-buildutils/debian/changelog	2014-10-08 20:07:50 UTC (rev 5615)
@@ -4,6 +4,8 @@
   * Backport mk_hyperv, needed by 10.1 RC
 
   [ Steven Chamberlain ]
+  * Do not use -fstack-protector on hppa/parisc arch (thanks, Helge
+    Deller) (Closes: #758377)
   * In get-orig-source, svn export with --ignore-keywords so that
     revision tags do not fuzzy the patches
   * Add myself to Uploaders

Added: trunk/freebsd-buildutils/debian/patches/hppa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/hppa.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/hppa.diff	2014-10-08 20:07:50 UTC (rev 5615)
@@ -0,0 +1,22 @@
+From: Helge Deller <deller at gmx.de>
+Subject: Do not use -fstack-protector on hppa/parisc arch.
+Bug-Debian: https://bugs.debian.org/758377
+Forwarded: not-needed
+
+--- a/src/share/mk/bsd.sys.mk
++++ b/src/share/mk/bsd.sys.mk
+@@ -123,11 +123,12 @@
+ .endif # CLANG
+ 
+ .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+-    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
++    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
++    ${MACHINE_CPUARCH} != "hppa"
+ # Don't use -Wstack-protector as it breaks world with -Werror.
+ SSP_CFLAGS?=	-fstack-protector
+ CFLAGS+=	${SSP_CFLAGS}
+-.endif # SSP && !IA64 && !ARM && !MIPS
++.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA
+ 
+ # Allow user-specified additional warning flags
+ CFLAGS+=	${CWARNFLAGS}

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2014-10-08 20:05:48 UTC (rev 5614)
+++ trunk/freebsd-buildutils/debian/patches/series	2014-10-08 20:07:50 UTC (rev 5615)
@@ -29,3 +29,4 @@
 aicasm.diff
 makefiles.diff
 #test
+hppa.diff