From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 55A6A138A1A for ; Wed, 18 Feb 2015 17:09:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C31E7E0970; Wed, 18 Feb 2015 17:09:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 654BCE0970 for ; Wed, 18 Feb 2015 17:09:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A2B23406CE for ; Wed, 18 Feb 2015 17:09:20 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2279) id 899B71209D; Wed, 18 Feb 2015 17:09:17 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-mk-defs/files: freebsd-mk-defs-add-nossp-cflags.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: freebsd-mk-defs-add-nossp-cflags.patch X-VCS-Directories: sys-freebsd/freebsd-mk-defs/files X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150218170917.899B71209D@oystercatcher.gentoo.org> Date: Wed, 18 Feb 2015 17:09:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0be0e721-d89b-4593-beac-8ee8bdb7b9fb X-Archives-Hash: 27b6c66fc4e5c82d2d906874d09d9956 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}