From owner-svn-src-all@FreeBSD.ORG  Tue Apr  1 08:19:31 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE8B121C;
 Tue,  1 Apr 2014 08:19:31 +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 AA99BEDB;
 Tue,  1 Apr 2014 08:19:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s318JVtU062585;
 Tue, 1 Apr 2014 08:19:31 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s318JV6C062584;
 Tue, 1 Apr 2014 08:19:31 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201404010819.s318JV6C062584@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 1 Apr 2014 08:19:31 +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: r263984 - in stable:
 10/contrib/llvm/tools/clang/lib/Driver 9/contrib/llvm/tools/clang/lib/Driver
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 08:19:31 -0000

Author: dim
Date: Tue Apr  1 08:19:30 2014
New Revision: 263984
URL: http://svnweb.freebsd.org/changeset/base/263984

Log:
  MFC r263891:
  
  Make clang default to DWARF2 debug info format for FreeBSD 10.x and
  earlier.  For head, this commit does not change anything, but it is
  purely meant to be MFC'd.

Modified:
  stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Tue Apr  1 06:46:59 2014	(r263983)
+++ stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Tue Apr  1 08:19:30 2014	(r263984)
@@ -2628,8 +2628,10 @@ void Clang::ConstructJob(Compilation &C,
       CmdArgs.push_back("-gdwarf-4");
     else if (!A->getOption().matches(options::OPT_g0) &&
              !A->getOption().matches(options::OPT_ggdb0)) {
-      // Default is dwarf-2 for darwin.
-      if (getToolChain().getTriple().isOSDarwin())
+      // Default is dwarf-2 for darwin and FreeBSD <= 10.
+      const llvm::Triple &Triple = getToolChain().getTriple();
+      if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD &&
+          Triple.getOSMajorVersion() <= 10))
         CmdArgs.push_back("-gdwarf-2");
       else
         CmdArgs.push_back("-g");