From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 26 23:28:16 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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CED3ECF8;
 Wed, 26 Nov 2014 23:28:16 +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 BBEA12D9;
 Wed, 26 Nov 2014 23:28:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNSGUu034759;
 Wed, 26 Nov 2014 23:28:16 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNSG4V034758;
 Wed, 26 Nov 2014 23:28:16 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201411262328.sAQNSG4V034758@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 26 Nov 2014 23:28:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275151 - projects/clang350-import/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-1
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: Wed, 26 Nov 2014 23:28:16 -0000

Author: dim
Date: Wed Nov 26 23:28:16 2014
New Revision: 275151
URL: https://svnweb.freebsd.org/changeset/base/275151

Log:
  Since for clang 3.5.0 ARM EHABI is now the default, the -mllvm
  -arm-enable-ehabi flag is no longer supported.  Use it only for older
  versions of clang.

Modified:
  projects/clang350-import/sys/conf/Makefile.arm

Modified: projects/clang350-import/sys/conf/Makefile.arm
==============================================================================
--- projects/clang350-import/sys/conf/Makefile.arm	Wed Nov 26 23:07:54 2014	(r275150)
+++ projects/clang350-import/sys/conf/Makefile.arm	Wed Nov 26 23:28:16 2014	(r275151)
@@ -47,8 +47,10 @@ CFLAGS.clang += -mfpu=none
 
 .if !empty(DDB_ENABLED)
 CFLAGS += -funwind-tables
-# clang requires us to tell it to emit assembly with unwind information
-CFLAGS.clang += -mllvm -arm-enable-ehabi
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500
+# clang < 3.5.0 requires us to tell it to emit assembly with unwind information
+CFLAGS += -mllvm -arm-enable-ehabi
+.endif
 .endif
 
 # hack because genassym.c includes sys/bus.h which includes these.