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

[Roman Divacky]

Author: rdivacky
Date: Fri May 21 15:49:09 2010
New Revision: 208377
URL: http://svn.freebsd.org/changeset/base/208377

Log:
  Revert r207339, ld arguments should be passed via -Wl

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	Fri May 21 15:47:56 2010	(r208376)
+++ projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.td	Fri May 21 15:49:09 2010	(r208377)
@@ -139,8 +139,6 @@ 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	Fri May 21 15:47:56 2010	(r208376)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Fri May 21 15:49:09 2010	(r208377)
@@ -2855,8 +2855,6 @@ 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) {