misc.c (gnat_init_options): Do not concatenate -I and its argument, except for the...

	* gcc-interface/misc.c (gnat_init_options): Do not concatenate -I and
	its argument, except for the special -I- switch.

From-SVN: r170150

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index cf72091f9b4c8b6d64752ebc0b13467fdf8ffec6..defad830e15b8fbe5f573eb3f9d4575132c4618d 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/misc.c (gnat_init_options): Do not concatenate -I and
+       its argument, except for the special -I- switch.
+
 2011-02-12  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * gnat_ugn.texi (Compiling Different Versions of Ada): Update

diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 360ebab8aed346af6332369d237c530677af0777..4f7a5e1da1dca5982a9e38f99c2eeba4d095cd97 100644 (file)
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -195,13 +195,12 @@ gnat_init_options (unsigned int decoded_options_count,
          || num_elements == 0)
        continue;
 
-      if (decoded_options[i].opt_index == OPT_I)
-       {
-         gcc_assert (num_elements == 2);
-         save_argv[save_argc++]
-           = concat (decoded_options[i].canonical_option[0],
-                     decoded_options[i].canonical_option[1], NULL);
-       }
+      /* Deal with -I- specially since it must be a single switch.  */
+      if (decoded_options[i].opt_index == OPT_I
+         && num_elements == 2
+         && decoded_options[i].canonical_option[1][0] == '-'
+         && decoded_options[i].canonical_option[1][1] == '\0')
+       save_argv[save_argc++] = "-I-";
       else
        {
          gcc_assert (num_elements >= 1 && num_elements <= 2);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 82e8ba34c01870e44101a0450e760dbe5d3e6614..9d200a419afd51cc5343d47fcf7aa4ed706aeedc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/include.adb: New test.
+
 2011-02-14  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/47728

diff --git a/gcc/testsuite/gnat.dg/include.adb b/gcc/testsuite/gnat.dg/include.adb
new file mode 100644 (file)
index 0000000..ec183c7
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/include.adb
@@ -0,0 +1,4 @@
+-- { dg-do compile } */
+-- { dg-options "-cargs -I -gnatws" }
+
+-- { dg-error "search directory missing" "" { target *-*-* } 0 }