From patchwork Wed Jun 23 14:06:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 56678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 33A28B6F06 for ; Thu, 24 Jun 2010 00:06:52 +1000 (EST) Received: (qmail 30893 invoked by alias); 23 Jun 2010 14:06:50 -0000 Received: (qmail 30878 invoked by uid 22791); 23 Jun 2010 14:06:48 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_VF, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-pz0-f47.google.com (HELO mail-pz0-f47.google.com) (209.85.210.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 Jun 2010 14:06:36 +0000 Received: by pzk3 with SMTP id 3so176426pzk.20 for ; Wed, 23 Jun 2010 07:06:34 -0700 (PDT) Received: by 10.142.2.11 with SMTP id 11mr7247439wfb.51.1277301994573; Wed, 23 Jun 2010 07:06:34 -0700 (PDT) Received: from bubble.grove.modra.org ([115.187.252.19]) by mx.google.com with ESMTPS id i19sm4579415rvn.11.2010.06.23.07.06.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 23 Jun 2010 07:06:34 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 96E9E170C2A8; Wed, 23 Jun 2010 23:36:28 +0930 (CST) Date: Wed, 23 Jun 2010 23:36:28 +0930 From: Alan Modra To: gcc-patches@gcc.gnu.org Subject: r158908 breaks ld testsuite Message-ID: <20100623140628.GD21855@bubble.grove.modra.org> Mail-Followup-To: gcc-patches@gcc.gnu.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list 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; }