From patchwork Wed Jun 23 14:06:28 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: r158908 breaks ld testsuite
Date: Wed, 23 Jun 2010 04:06:28 -0000
From: Alan Modra <amodra@gmail.com>
X-Patchwork-Id: 56678
Message-Id: <20100623140628.GD21855@bubble.grove.modra.org>
To: gcc-patches@gcc.gnu.org

The ld testsuite passes -Wl,--version-script=foo.map to gcc in a
couple of places.  This triggers a dump of collect2 version and
collect-ld args.  I'll commit the following as obvious after
regression tests complete tomorrow.

	* collect2.c (main): Match exactly --version and --help.


Index: gcc/collect2.c
===================================================================
--- gcc/collect2.c	(revision 161152)
+++ gcc/collect2.c	(working copy)
@@ -1593,9 +1593,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;
 	    }