Fix the Xassembler and Xpreprocessor options, which have never worked right.

PR driver/21112
* gcc.c (process_command): In the second argv scan loop, ignore
Xassembler and Xpreprocessor, along with their argument.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99221 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e2568bc..716e81f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-04  James E Wilson  <wilson@specifixinc.com>
+
+       PR driver/21112
+       * gcc.c (process_command): In the second argv scan loop, ignore
+       Xassembler and Xpreprocessor, along with their argument.
+
 2005-05-04  Kazu Hirata  <kazu@cs.umass.edu>
 
        * tree-flow-inline.h, tree-ssa-operands.c,

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 1a0418d..e131eb6 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3942,16 +3942,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
          infiles[n_infiles].language = "*";
          infiles[n_infiles++].name = argv[++i];
        }
+      /* Xassembler and Xpreprocessor were already handled in the first argv
+        scan, so all we need to do here is ignore them and their argument.  */
       else if (strcmp (argv[i], "-Xassembler") == 0)
-       {
-         infiles[n_infiles].language = "*";
-         infiles[n_infiles++].name = argv[++i];
-       }
+       i++;
       else if (strcmp (argv[i], "-Xpreprocessor") == 0)
-       {
-         infiles[n_infiles].language = "*";
-         infiles[n_infiles++].name = argv[++i];
-       }
+       i++;
       else if (strcmp (argv[i], "-l") == 0)
        { /* POSIX allows separation of -l and the lib arg;
             canonicalize by concatenating -l with its arg */