From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 12 14:37:40 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 3C8EE4AF;
 Sun, 12 Jan 2014 14:37:40 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2793C161C;
 Sun, 12 Jan 2014 14:37:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CEbeHK052330;
 Sun, 12 Jan 2014 14:37:40 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CEbePe052329;
 Sun, 12 Jan 2014 14:37:40 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201401121437.s0CEbePe052329@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 12 Jan 2014 14:37:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r260564 - stable/10/sys/conf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jan 2014 14:37:40 -0000

Author: dim
Date: Sun Jan 12 14:37:39 2014
New Revision: 260564
URL: http://svnweb.freebsd.org/changeset/base/260564

Log:
  MFC r260494:
  
  Fix a braino with r259730: we cannot currently use CFLAGS.gcc or
  CFLAGS.clang in sys/conf/Makefile.arm, since the main kernel build does
  not use <bsd.sys.mk>.  So revert that particular change for now.
  
  Pointy hat to:	me
  Noticed by:	zbb

Modified:
  stable/10/sys/conf/Makefile.arm
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/Makefile.arm
==============================================================================
--- stable/10/sys/conf/Makefile.arm	Sun Jan 12 13:16:25 2014	(r260563)
+++ stable/10/sys/conf/Makefile.arm	Sun Jan 12 14:37:39 2014	(r260564)
@@ -39,16 +39,20 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri
 STRIP_FLAGS = -S
 .endif
 
-CFLAGS.gcc += -mno-thumb-interwork
+.if ${COMPILER_TYPE} != "clang"
+CFLAGS += -mno-thumb-interwork
+.endif
 
 .if empty(DDB_ENABLED)
-.if defined(WITHOUT_ARM_EABI)
-CFLAGS.gcc += -mno-apcs-frame
+.if defined(WITHOUT_ARM_EABI) && ${COMPILER_TYPE} != "clang"
+CFLAGS += -mno-apcs-frame
 .endif
 .elif !defined(WITHOUT_ARM_EABI)
 CFLAGS += -funwind-tables
+.if ${COMPILER_TYPE} == "clang"
 # clang requires us to tell it to emit assembly with unwind information
-CFLAGS.clang += -mllvm -arm-enable-ehabi
+CFLAGS += -mllvm -arm-enable-ehabi
+.endif
 .endif
 
 SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \