-l flag accepts space and emits without space to llvm frontend

Author: RAJAGOPALAN-GANGADHARAN

include/swift/Option/Options.td

@@ -701,7 +701,7 @@ def libc : Separate<["-"], "libc">, HelpText<"libc runtime library to use">;
 
 def linker_option_Group : OptionGroup<"<linker-specific options>">;
 
-def l : Joined<["-"], "l">, Group<linker_option_Group>,
+def l : JoinedOrSeparate<["-"], "l">, Group<linker_option_Group>,
     Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
     HelpText<"Specifies a library which should be linked against">;
 def framework : Separate<["-"], "framework">, Group<linker_option_Group>,

lib/Driver/ToolChains.cpp

@@ -142,6 +142,14 @@ static void addLTOArgs(const OutputInfo &OI, ArgStringList &arguments) {
   }
 }
 
+static void addLinkedLibArgs(const ArgList &Args, ArgStringList &FrontendArgs) {
+  for(auto Arg:Args.getAllArgValues(options::OPT_l))
+  {
+    std::string* lArg = new std::string("-l" + Arg);
+    FrontendArgs.push_back(lArg->c_str());
+  }
+}
+
 void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
                                       const CommandOutput &output,
                                       const ArgList &inputArgs,
@@ -842,7 +850,8 @@ ToolChain::constructInvocation(const InterpretJobAction &job,
   Arguments.push_back("-module-name");
   Arguments.push_back(context.Args.MakeArgString(context.OI.ModuleName));
 
-  context.Args.AddAllArgs(Arguments, options::OPT_l, options::OPT_framework);
+  context.Args.AddAllArgs(Arguments, options::OPT_framework);
+  addLinkedLibArgs(context.Args, Arguments);
 
   // The immediate arguments must be last.
   context.Args.AddLastArg(Arguments, options::OPT__DASH_DASH);
@@ -1190,8 +1199,8 @@ ToolChain::constructInvocation(const REPLJobAction &job,
   addRuntimeLibraryFlags(context.OI, FrontendArgs);
 
   context.Args.AddLastArg(FrontendArgs, options::OPT_import_objc_header);
-  context.Args.AddAllArgs(FrontendArgs, options::OPT_l, options::OPT_framework,
-                          options::OPT_L);
+  context.Args.AddAllArgs(FrontendArgs, options::OPT_framework, options::OPT_L);
+  addLinkedLibArgs(context.Args, FrontendArgs);
 
   if (!useLLDB) {
     FrontendArgs.insert(FrontendArgs.begin(), {"-frontend", "-repl"});