* config/mmix/mmix.c: Include basic-block.h.

[pf3gnuchains/gcc-fork.git] / gcc / collect2.c

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 0669a4e..b26aaf3 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1207,7 +1207,7 @@ main (int argc, char **argv)
            use_verbose = true;
            lto_mode = LTO_MODE_LTO;
          }
-        else if (! strcmp (argv[i], "-fwhopr") && ! use_plugin)
+        else if (! strncmp (argv[i], "-fwhopr", 7) && ! use_plugin)
          {
            use_verbose = true;
            lto_mode = LTO_MODE_WHOPR;
@@ -1482,7 +1482,8 @@ main (int argc, char **argv)
              break;
 
             case 'f':
-             if (strcmp (arg, "-flto") == 0 || strcmp (arg, "-fwhopr") == 0)
+             if (strcmp (arg, "-flto") == 0
+                 || strncmp (arg, "-fwhopr", 7) == 0)
                {
 #ifdef ENABLE_LTO
                  /* Do not pass LTO flag to the linker. */
@@ -1534,12 +1535,7 @@ main (int argc, char **argv)
            case 'o':
              if (arg[2] == '\0')
                output_file = *ld1++ = *ld2++ = *++argv;
-             else if (1
-#ifdef SWITCHES_NEED_SPACES
-                      && ! strchr (SWITCHES_NEED_SPACES, arg[1])
-#endif
-                      )
-
+             else
                output_file = &arg[2];
              break;
 
@@ -1592,9 +1588,9 @@ main (int argc, char **argv)
                }
              else if (strncmp (arg, "--sysroot=", 10) == 0)
                target_system_root = arg + 10;
-             else if (strncmp (arg, "--version", 9) == 0)
+             else if (strcmp (arg, "--version") == 0)
                vflag = true;
-             else if (strncmp (arg, "--help", 9) == 0)
+             else if (strcmp (arg, "--help") == 0)
                helpflag = true;
              break;
            }