mgorny 15/02/18 17:09:17 Added: freebsd-mk-defs-add-nossp-cflags.patch Log: Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by Yuta SATOH (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.1 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch?rev=1.1&content-type=text/plain Index: freebsd-mk-defs-add-nossp-cflags.patch =================================================================== https://bugs.gentoo.org/show_bug.cgi?id=511698 diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index e438633..de4a05b 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ CFLAGS+= -Qunused-arguments .endif # CLANG -.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ - ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" +.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \ + && ${MACHINE_CPUARCH} != "mips" +.if ${MK_SSP} != "no" # Don't use -Wstack-protector as it breaks world with -Werror. SSP_CFLAGS?= -fstack-protector +.else +# gcc-4.9, -fstack-protector-strong is enabled by default. +# Add -fno-stack-protector to disable it. Gentoo Bug #511698. +SSP_CFLAGS= -fno-stack-protector +.endif #SSP CFLAGS+= ${SSP_CFLAGS} -.endif # SSP && !IA64 && !ARM && !MIPS +.endif # !IA64 && !ARM && !MIPS # Allow user-specified additional warning flags CFLAGS+= ${CWARNFLAGS}
