From owner-svn-src-head@FreeBSD.ORG  Sat Mar 29 00:48:51 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 337CFB19;
 Sat, 29 Mar 2014 00:48:51 +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 1F59BC13;
 Sat, 29 Mar 2014 00:48:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2T0moqw068720;
 Sat, 29 Mar 2014 00:48:50 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2T0moSh068719;
 Sat, 29 Mar 2014 00:48:50 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403290048.s2T0moSh068719@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 29 Mar 2014 00:48:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263892 - head/contrib/llvm/patches
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Mar 2014 00:48:51 -0000

Author: dim
Date: Sat Mar 29 00:48:50 2014
New Revision: 263892
URL: http://svnweb.freebsd.org/changeset/base/263892

Log:
  Add the llvm/clang patch for r263891.

Added:
  head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff

Added: head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff	Sat Mar 29 00:48:50 2014	(r263892)
@@ -0,0 +1,22 @@
+This patch makes clang default to DWARF2 debug info format for FreeBSD
+10.x and earlier.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/263891
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -2628,8 +2628,10 @@ void Clang::ConstructJob(Compilation &C, const Job
+       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");