Reorder Xlinker and linker option group

Author: keith

lib/Driver/DarwinToolChains.cpp

@@ -475,9 +475,9 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
 
   Arguments.push_back("-no_objc_category_merging");
 
-  // These custom arguments should be right before the object file at the end
-  context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
+  // These custom arguments should be right before the object file at the end.
   context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
 
   // This should be the last option, for convenience in checking output.
   Arguments.push_back("-o");

lib/Driver/UnixToolChains.cpp

@@ -322,9 +322,9 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
     Arguments.push_back("-v");
   }
 
-  // These custom arguments should be right before the object file at the end
-  context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
+  // These custom arguments should be right before the object file at the end.
   context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
 
   // This should be the last option, for convenience in checking output.
   Arguments.push_back("-o");