From patchwork Mon Mar 12 11:01:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ludovic =?iso-8859-1?Q?Court=E8s?= X-Patchwork-Id: 146058 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 186E3B6FAA for ; Mon, 12 Mar 2012 22:02:06 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1332154927; h=Comment: DomainKey-Signature:Received:Received:Received:Received:From:To: Cc:Subject:References:Date:In-Reply-To:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=bPY5afiKTd5Y24sNwgUAzrt2xdg=; b=qFgXJ3S4UVgWNug h3zybz5SaYDpMtS4Xo/Qw0QPKu3pOkFSX0ZM2AvQ0waWkwjgtNNIz4Q3KoH7eqd+ 8su1ZI0LgyAzbbM4H6gdKPuoy147dX40nhQddd6Cgy3IH59qtGC3vcbNrcqyWsZI j2yboD+fq0X1sK/DA8OeBHGAOjtM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:From:To:Cc:Subject:References:X-URL:X-Revolutionary-Date:X-PGP-Key-ID:X-PGP-Key:X-PGP-Fingerprint:X-OS:Date:In-Reply-To:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=KWzS/8yrTq3w7tMO0g7ngBlncM3mpjmD7IoAACvUlgiuAED/MCFt0HSUKatC3k 5oDXUHr37jO7zis63+mLd1LQErwP5Bpas+7RJ21U3gT+2QJ88IkB4mBQ1bSIZqb6 GJigfp6Np6Z5cPem2n6DFPRc6/5x+68xtIFxOSS6IaiS8=; Received: (qmail 18740 invoked by alias); 12 Mar 2012 11:02:02 -0000 Received: (qmail 18724 invoked by uid 22791); 12 Mar 2012 11:01:59 -0000 X-SWARE-Spam-Status: No, hits=-5.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail1-relais-roc.national.inria.fr (HELO mail1-relais-roc.national.inria.fr) (192.134.164.82) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Mar 2012 11:01:46 +0000 Received: from unknown (HELO pluto) ([193.50.110.167]) by mail1-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 12 Mar 2012 12:01:44 +0100 From: ludovic.courtes@inria.fr (Ludovic =?iso-8859-1?Q?Court=E8s?=) To: "Joseph S. Myers" Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] Don't insert white space in 'orig_option_with_args_text' for OPT_l References: <87ipidvl7h.fsf@inria.fr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 23 =?iso-8859-1?Q?Vent=F4se?= an 220 de la =?iso-8859-1?Q?R=E9volution?= X-PGP-Key-ID: 0xEA52ECF4 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 83C4 F8E5 10A3 3B4C 5BEA D15D 77DD 95E2 EA52 ECF4 X-OS: x86_64-unknown-linux-gnu Date: Mon, 12 Mar 2012 12:01:43 +0100 In-Reply-To: (Joseph S. Myers's message of "Fri, 9 Mar 2012 17:27:49 +0000 (UTC)") Message-ID: <87y5r6t754.fsf@inria.fr> User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.93 (gnu/linux) MIME-Version: 1.0 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 Hi, Thanks for the review. "Joseph S. Myers" skribis: > On Fri, 9 Mar 2012, Ludovic Courtès wrote: > >> * gcc/opts-common.c (generate_option): Don't insert white space in >> `canonical_option' when OPT_INDEX is OPT_l. > > No, opts-common.c should not have special cases for individual options > like that. The canonical form has the separate arguments. Indeed, and the comment in opts.h makes it clear, though I think I was confused by the phrase “original text of option”. > gcc.c has a special case for how it passes this option to > subprocesses; if you have problems with some output from gfortran > involving -l options, you should change the gfortran driver as needed > so it outputs -l options in a different way. The patch below solves the problem in a gfortran-specific way. WDYT? Thanks, Ludo’. 2012-03-09 Ludovic Courtès * gcc/fortran/gfotranspec.c (lang_specific_driver): When VERBOSE, make sure `-l' options are printed with no intertwined white spaces. diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c index 2240bfb..55e5e42 100644 --- a/gcc/fortran/gfortranspec.c +++ b/gcc/fortran/gfortranspec.c @@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); { fprintf (stderr, _("Driving:")); for (i = 0; i < g77_newargc; i++) + { + if (g77_new_decoded_options[i].opt_index == OPT_l) + /* Make sure no white space is inserted after `-l'. */ + fprintf (stderr, " -l%s", + g77_new_decoded_options[i].canonical_option[1]); + else fprintf (stderr, " %s", g77_new_decoded_options[i].orig_option_with_args_text); + } fprintf (stderr, "\n"); }