svn commit: r207339 - in projects/clangbsd/contrib/llvm/tools/clang: include/clang/Driver lib/Driver

[Roman Divacky]

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) {