From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 21 19:58:46 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 97070F8F;
 Fri, 21 Feb 2014 19:58:46 +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 80A95167D;
 Fri, 21 Feb 2014 19:58:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LJwkum030600;
 Fri, 21 Feb 2014 19:58:46 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LJwkuG030599;
 Fri, 21 Feb 2014 19:58:46 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201402211958.s1LJwkuG030599@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 21 Feb 2014 19:58:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262302 - projects/clang-sparc64/share/mk
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.17
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: Fri, 21 Feb 2014 19:58:46 -0000

Author: dim
Date: Fri Feb 21 19:58:45 2014
New Revision: 262302
URL: http://svnweb.freebsd.org/changeset/base/262302

Log:
  In case source files are compiled with -g, tell clang not to emit .cfi
  directives, since on sparc64 we must still GNU as, which does not
  support those directives.
  
  Note there are several programs and libraries in our tree, which are
  always compiled with -g, even if DEBUG_FLAGS is not set by the user!

Modified:
  projects/clang-sparc64/share/mk/bsd.sys.mk

Modified: projects/clang-sparc64/share/mk/bsd.sys.mk
==============================================================================
--- projects/clang-sparc64/share/mk/bsd.sys.mk	Fri Feb 21 18:49:08 2014	(r262301)
+++ projects/clang-sparc64/share/mk/bsd.sys.mk	Fri Feb 21 19:58:45 2014	(r262302)
@@ -120,6 +120,10 @@ CLANG_NO_IAS=	 -no-integrated-as
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
 		 -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
 CFLAGS+=	 -Qunused-arguments
+.if ${MACHINE_CPUARCH} == "sparc64"
+# Don't emit .cfi directives, since we must use GNU as on sparc64, for now.
+CFLAGS+=	 -fno-dwarf2-cfi-asm
+.endif # SPARC64
 CFLAGS+=	 ${CFLAGS.clang}
 CXXFLAGS+=	 ${CXXFLAGS.clang}
 .else # !CLANG