From owner-svn-src-head@freebsd.org  Thu Dec  3 15:41:12 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 022DFA4046C;
 Thu,  3 Dec 2015 15:41:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C3DBA1A46;
 Thu,  3 Dec 2015 15:41:11 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB3FfALE042743;
 Thu, 3 Dec 2015 15:41:10 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB3FfAna042742;
 Thu, 3 Dec 2015 15:41:10 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201512031541.tB3FfAna042742@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 3 Dec 2015 15:41:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291701 - head/contrib/llvm/tools/clang/tools/driver
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Dec 2015 15:41:12 -0000

Author: dim
Date: Thu Dec  3 15:41:10 2015
New Revision: 291701
URL: https://svnweb.freebsd.org/changeset/base/291701

Log:
  In assembler mode, clang defaulted to DWARF3, if only -g was specified.
  Change this to DWARF2, in the simplest way possible.  (Upstream, this
  was fixed in clang trunk r250173, but this was done along with a lot of
  shuffling around of debug option handling, so it cannot be applied
  as-is.)
  
  Noticed by:	des
  MFC after:	3 days

Modified:
  head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp

Modified: head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp	Thu Dec  3 15:19:29 2015	(r291700)
+++ head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp	Thu Dec  3 15:41:10 2015	(r291701)
@@ -141,7 +141,7 @@ public:
     RelaxAll = 0;
     NoExecStack = 0;
     FatalWarnings = 0;
-    DwarfVersion = 3;
+    DwarfVersion = 2;
   }
 
   static bool CreateFromArgs(AssemblerInvocation &Res,