ccc: Darwin/x86/link: Fix a few incompatibilities with gcc (missed

forwarding -s to linker, and was only taking last arg in some cases
when should have been taking all).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62824 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index c1b4e41b6a7c392257353a762b66027faa180098..04d07e226efb444fd0b719764fd9e43dbeae7f2b 100644 (file)
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -989,14 +989,15 @@ class Darwin_X86_LinkTool(Tool):
 
         # FIXME: gcc has %{x} in here. How could this ever happen?
         # Cruft?
-        arglist.addLastArg(cmd_args, arglist.parser.dGroup)
-        arglist.addLastArg(cmd_args, arglist.parser.tOption)
-        arglist.addLastArg(cmd_args, arglist.parser.ZOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.dOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.sOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.tOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.ZOption)
         arglist.addAllArgs(cmd_args, arglist.parser.uGroup)
-        arglist.addLastArg(cmd_args, arglist.parser.AOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.AOption)
         arglist.addLastArg(cmd_args, arglist.parser.eOption)
-        arglist.addLastArg(cmd_args, arglist.parser.mOption)
-        arglist.addLastArg(cmd_args, arglist.parser.rOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.mOption)
+        arglist.addAllArgs(cmd_args, arglist.parser.rOption)
 
         cmd_args.extend(arglist.render(output))