Draft implementation for -Xcc=

- No documentation. - Reuses -preview=noXlinker test.
dlang · Sep 26, 2019 · 7a04443 · 7a04443
1 parent f0bd935
commit 7a04443
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/dmd/globals.d b/src/dmd/globals.d
@@ -264,6 +264,7 @@ extern (C++) struct Param
     // Linker stuff
     Array!(const(char)*) objfiles;
     Array!(const(char)*) linkswitches;
+    Array!bool linkswitchIsForCC;
     Array!(const(char)*) libfiles;
     Array!(const(char)*) dllfiles;
     const(char)[] deffile;

diff --git a/src/dmd/link.d b/src/dmd/link.d
@@ -601,11 +601,12 @@ public int runLINK()
          */
 
         // STEP 1
-        foreach (p; global.params.linkswitches)
+        foreach (pi, p; global.params.linkswitches)
         {
             if (p && p[0] && !flagIsLibraryRelated(p))
             {
-                argv.push("-Xlinker");
+                if (!global.params.linkswitchIsForCC[pi])
+                    argv.push("-Xlinker");
                 argv.push(p);
             }
         }
@@ -618,11 +619,11 @@ public int runLINK()
         }
 
         // STEP 3
-        foreach (p; global.params.linkswitches)
+        foreach (pi, p; global.params.linkswitches)
         {
             if (p && p[0] && flagIsLibraryRelated(p))
             {
-                if (!startsWith(p, "-l") && !startsWith(p, "-L"))
+                if (!startsWith(p, "-l") && !startsWith(p, "-L") && !global.params.linkswitchIsForCC[pi])
                 {
                     // Don't need -Xlinker if switch starts with -l or -L.
                     // Eliding -Xlinker is significant for -L since it allows our paths

diff --git a/src/dmd/mars.d b/src/dmd/mars.d
@@ -2143,6 +2143,11 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param
                 goto Lerror;
             }
         }
+        else if (startsWith(p + 1, "Xcc="))
+        {
+            params.linkswitches.push(p + 5);
+            params.linkswitchIsForCC.push(true);
+        }
         else if (p[1] == 'X')       // https://dlang.org/dmd.html#switch-X
         {
             params.doJsonGeneration = true;
@@ -2357,6 +2362,7 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param
         else if (p[1] == 'L')                        // https://dlang.org/dmd.html#switch-L
         {
             params.linkswitches.push(p + 2 + (p[2] == '='));
+            params.linkswitchIsForCC.push(false);
         }
         else if (startsWith(p + 1, "defaultlib="))   // https://dlang.org/dmd.html#switch-defaultlib
         {

diff --git a/test/dshell/test6952.d b/test/dshell/test6952.d
@@ -10,9 +10,9 @@ void main()
     }
 
     auto cmd = shellExpand("$DMD"
-        ~ " -m$MODEL -of$OUTPUT_BASE/main$EXE -conf= -fPIC -g -v -preview=noXlinker"
+        ~ " -m$MODEL -of$OUTPUT_BASE/main$EXE -conf= -fPIC -g -v"
         ~ " -I$EXTRA_FILES/test6952/ -defaultlib="
-        ~ " -L-nostartfiles -L-nostdlib -L-nodefaultlibs $EXTRA_FILES/test6952/main.d");
+        ~ " -Xcc=-nostartfiles -Xcc=-nostdlib -Xcc=-nodefaultlibs $EXTRA_FILES/test6952/main.d");
 
     // Remove DFLAGS environment variable.  Everything we need is explicitly stated in
     // the command line above.
@@ -27,7 +27,7 @@ void main()
     immutable lines = result.output.split("\n");
     auto ccLine = lines.find!(a => a.startsWith("cc"))[0];
 
-    // Due to the `-preview=noXlinker` switch, the arguments prefixed with `-L` should
+    // Due to the `-preview=noXlinker` switch, the arguments prefixed with `-Xcc` should
     // not have an additional `-Xlinker` prepended to them
     assert(ccLine.find("-Xlinker -nostartfiles") == "");
     assert(ccLine.find("-Xlinker -nostdlib") == "");