re PR driver/38381 (-b option seems to be broken)

	PR driver/38381
	* gcc.c (process_command): Accept also -b with configuration name
	in the next argument.
	* doc/invoke.texi (-b): Document that no hyphen is required if
	configuration name is in the next argument after -b.

From-SVN: r142947

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 21310d93916884c674e66d1e2338fa162818e5d0..1b9d89ff71824e74876940548b7fa9395dce6554 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-29  Jakub Jelinek  <jakub@redhat.com>
+
+       PR driver/38381
+       * gcc.c (process_command): Accept also -b with configuration name
+       in the next argument.
+       * doc/invoke.texi (-b): Document that no hyphen is required if
+       configuration name is in the next argument after -b.
+
 2008-12-27  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/38641

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 66d28c77f9ce0d4a1253ac4b578081c7ecfd6b8d..1bd99a7d8a572c626cc7ca507464715ddb06ae16 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -8601,7 +8601,8 @@ example, if a cross-compiler was configured with @samp{configure
 arm-elf}, meaning to compile for an arm processor with elf binaries,
 then you would specify @option{-b arm-elf} to run that cross compiler.
 Because there are other options beginning with @option{-b}, the
-configuration must contain a hyphen.
+configuration must contain a hyphen, or @option{-b} alone should be one
+argument followed by the configuration in the next argument.
 
 @item -V @var{version}
 @opindex V

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5481d0d4f44431127f59bf34a9ca28b9c928ff01..8e1938bd58a79bc919f72677de3917eba2f0af63 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3371,8 +3371,10 @@ process_command (int argc, const char **argv)
      Use heuristic that all configuration names must have at least
      one dash '-'. This allows us to pass options starting with -b.  */
   if (argc > 1 && argv[1][0] == '-'
-      && (argv[1][1] == 'V' ||
-        ((argv[1][1] == 'b') && (NULL != strchr(argv[1] + 2,'-')))))
+      && (argv[1][1] == 'V'
+         || (argv[1][1] == 'b'
+             && (argv[1][2] == '\0'
+                 || NULL != strchr (argv[1] + 2, '-')))))
     {
       const char *new_version = DEFAULT_TARGET_VERSION;
       const char *new_machine = DEFAULT_TARGET_MACHINE;
@@ -3382,8 +3384,10 @@ process_command (int argc, const char **argv)
       int baselen;
 
       while (argc > 1 && argv[1][0] == '-'
-            && (argv[1][1] == 'V' ||
-               ((argv[1][1] == 'b') && ( NULL != strchr(argv[1] + 2,'-')))))
+            && (argv[1][1] == 'V'
+                || (argv[1][1] == 'b'
+                    && (argv[1][2] == '\0'
+                        || NULL != strchr (argv[1] + 2, '-')))))
        {
          char opt = argv[1][1];
          const char *arg;
@@ -3842,7 +3846,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
          switch (c)
            {
            case 'b':
-             if (NULL == strchr(argv[i] + 2, '-'))
+             if (p[1] && NULL == strchr (argv[i] + 2, '-'))
                goto normal_switch;
 
              /* Fall through.  */