Message ID | 87fwdcrese.fsf@inria.fr |
---|---|
State | New |
Headers | show |
Ping. ludovic.courtes@inria.fr (Ludovic Courtès) skribis: > "Joseph S. Myers" <joseph@codesourcery.com> skribis: > >> On Mon, 12 Mar 2012, Ludovic Courtès wrote: >> >>> The patch below solves the problem in a gfortran-specific way. WDYT? >> >> I think that's the right approach for this issue. > > The previous patch was produced with ‘diff -b’. Here’s a fixed one. > Let me know if anything else needs to be done. > > Thanks, > Ludo’. > > 2012-03-09 Ludovic Courtès <ludovic.courtes@inria.fr> > > * 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++) > - fprintf (stderr, " %s", > - g77_new_decoded_options[i].orig_option_with_args_text); > + { > + 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"); > }
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++) - fprintf (stderr, " %s", - g77_new_decoded_options[i].orig_option_with_args_text); + { + 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"); }