From owner-svn-src-projects@FreeBSD.ORG  Sat May 31 11:07:30 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1EF5982;
 Sat, 31 May 2014 11:07:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFB032EE4;
 Sat, 31 May 2014 11:07:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VB7UGr055801;
 Sat, 31 May 2014 11:07:30 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VB7Umu055800;
 Sat, 31 May 2014 11:07:30 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201405311107.s4VB7Umu055800@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 31 May 2014 11:07:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r266920 - projects/arm64/sys/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2014 11:07:31 -0000

Author: cognet
Date: Sat May 31 11:07:30 2014
New Revision: 266920
URL: http://svnweb.freebsd.org/changeset/base/266920

Log:
  Define INLINE_LIMIT and disable -fstack-protector for arm64.

Modified:
  projects/arm64/sys/conf/kern.mk

Modified: projects/arm64/sys/conf/kern.mk
==============================================================================
--- projects/arm64/sys/conf/kern.mk	Sat May 31 06:17:34 2014	(r266919)
+++ projects/arm64/sys/conf/kern.mk	Sat May 31 11:07:30 2014	(r266920)
@@ -73,7 +73,7 @@ CFLAGS+=	-mno-mmx -mno-sse -msoft-float
 INLINE_LIMIT?=	8000
 .endif
 
-.if ${MACHINE_CPUARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "arm64"
 INLINE_LIMIT?=	8000
 .endif
 
@@ -159,7 +159,8 @@ CFLAGS+=	-ffreestanding
 # GCC SSP support
 #
 .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
-    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
+    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
+    ${MACHINE_CPUARCH} != "arm64"
 CFLAGS+=	-fstack-protector
 .endif