From owner-svn-src-projects@FreeBSD.ORG  Wed Apr 28 19:42:21 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 743E11065672;
	Wed, 28 Apr 2010 19:42:21 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 621728FC16;
	Wed, 28 Apr 2010 19:42:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SJgLWZ026530;
	Wed, 28 Apr 2010 19:42:21 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3SJgKdH026529;
	Wed, 28 Apr 2010 19:42:20 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201004281942.o3SJgKdH026529@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 28 Apr 2010 19:42:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207339 - in projects/clangbsd/contrib/llvm/tools/clang:
	include/clang/Driver lib/Driver
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 28 Apr 2010 19:42:21 -0000

Author: rdivacky
Date: Wed Apr 28 19:42:20 2010
New Revision: 207339
URL: http://svn.freebsd.org/changeset/base/207339

Log:
  Handle -S/-N when specified to a linker. Those are needed by btxldr.
  
  Diagnosed by:	jhb

Modified:
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.td
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.td	Wed Apr 28 19:36:25 2010	(r207338)
+++ projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.td	Wed Apr 28 19:42:20 2010	(r207339)
@@ -139,6 +139,8 @@ def MQ : JoinedOrSeparate<"-MQ">, Group<
 def MT : JoinedOrSeparate<"-MT">, Group<M_Group>;
 def Mach : Flag<"-Mach">;
 def M : Flag<"-M">, Group<M_Group>;
+def N : Flag<"-N">, Flags<[DriverOption]>,
+  HelpText<"--omagic to linker">;
 def O4 : Joined<"-O4">, Group<O_Group>;
 def ObjCXX : Flag<"-ObjC++">, Flags<[DriverOption]>,
   HelpText<"Treat source input files as Objective-C++ inputs">;

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Apr 28 19:36:25 2010	(r207338)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Apr 28 19:42:20 2010	(r207339)
@@ -2779,6 +2779,8 @@ void freebsd::Link::ConstructJob(Compila
   Args.AddAllArgs(CmdArgs, options::OPT_L);
   Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
   Args.AddAllArgs(CmdArgs, options::OPT_e);
+  Args.AddAllArgs(CmdArgs, options::OPT_S);
+  Args.AddAllArgs(CmdArgs, options::OPT_N);
 
   for (InputInfoList::const_iterator
          it = Inputs.begin(), ie = Inputs.end(); it != ie; ++it) {