From owner-svn-src-head@FreeBSD.ORG  Sat Jul 28 13:12:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 965E0106564A;
	Sat, 28 Jul 2012 13:12:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8077E8FC0A;
	Sat, 28 Jul 2012 13:12:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6SDCwJR029342;
	Sat, 28 Jul 2012 13:12:58 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6SDCweE029339;
	Sat, 28 Jul 2012 13:12:58 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201207281312.q6SDCweE029339@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 28 Jul 2012 13:12:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238864 - head/contrib/llvm/tools/clang/lib/Driver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 28 Jul 2012 13:12:58 -0000

Author: dim
Date: Sat Jul 28 13:12:57 2012
New Revision: 238864
URL: http://svn.freebsd.org/changeset/base/238864

Log:
  Similar to what is already done for Linux, make clang not complain about
  unused -g, -emit-llvm or -w arguments when doing linking.  E.g. invoking
  "clang -g foo.o -o foo" will now be silent.
  
  Reported by:	Jakub Lach <jakub_lach@mailplus.pl>
  MFC after:	1 week

Modified:
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sat Jul 28 12:50:25 2012	(r238863)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sat Jul 28 13:12:57 2012	(r238864)
@@ -4745,6 +4745,14 @@ void freebsd::Link::ConstructJob(Compila
   const Driver &D = getToolChain().getDriver();
   ArgStringList CmdArgs;
 
+  // Silence warning for "clang -g foo.o -o foo"
+  Args.ClaimAllArgs(options::OPT_g_Group);
+  // and "clang -emit-llvm foo.o -o foo"
+  Args.ClaimAllArgs(options::OPT_emit_llvm);
+  // and for "clang -w foo.o -o foo". Other warning options are already
+  // handled somewhere else.
+  Args.ClaimAllArgs(options::OPT_w);
+
   if (!D.SysRoot.empty())
     CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));