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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-26 23:54:36 +0000 (Sun, 26 Oct 2014)
New Revision: 5674

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/hppa.diff
Log:
Do not use -fstack-protector on alpha


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-10-26 19:57:50 UTC (rev 5673)
+++ trunk/freebsd-buildutils/debian/changelog	2014-10-26 23:54:36 UTC (rev 5674)
@@ -2,6 +2,7 @@
 
   * Raise Build-Depends on freebsd-glue to >= 0.2.20~, to not be
     affected by #759249 if the installed libbsd-dev is newer
+  * Do not use -fstack-protector on alpha
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 21 Oct 2014 22:50:38 +0100
 

Modified: trunk/freebsd-buildutils/debian/patches/hppa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/hppa.diff	2014-10-26 19:57:50 UTC (rev 5673)
+++ trunk/freebsd-buildutils/debian/patches/hppa.diff	2014-10-26 23:54:36 UTC (rev 5674)
@@ -11,12 +11,12 @@
  .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
 -    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 +    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
-+    ${MACHINE_CPUARCH} != "hppa"
++    ${MACHINE_CPUARCH} != "hppa" && ${MACHINE_CPUARCH} != "alpha"
  # 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
++.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA && !ALPHA
  
  # Allow user-specified additional warning flags
  CFLAGS+=	${CWARNFLAGS}