Re: -al

[Nick Clifton]

Hi George,

> I have been using the -al=file to generate assembler listing files. In
> version 2.16 this is being interpreted as --alternate.

Oops - sorry - please ignore my previous post.  I missed that you were 
using the '=file' syntax.  When I added that to the command line of my 
2.16 test build I was able to reproduce your problem.

Please could you try the attached patch.  I believe that it will resolve 
the problem.

Cheers
  Nick

gas/ChangeLog
2006-03-08  Nick Clifton  <address@hidden>

        * as.c (parse_args): Add an entry for "al" to prevent -al from
        being confused with --alternate.

Index: gas/as.c
===================================================================
RCS file: /cvs/src/src/gas/as.c,v
retrieving revision 1.58
diff -c -3 -p -r1.58 as.c
*** gas/as.c    3 Mar 2005 01:29:52 -0000       1.58
--- gas/as.c    8 Mar 2006 10:06:32 -0000
*************** parse_args (int * pargc, char *** pargv)
*** 437,447 ****
         the end of the preceeding line so that it is simpler to
         selectively add and remove lines from this list.  */
      {"alternate", no_argument, NULL, OPTION_ALTERNATE}
!     /* The entry for "a" is here to prevent getopt_long_only() from
!        considering that -a is an abbreviation for --alternate.  This is
!        necessary because -a=<FILE> is a valid switch but getopt would
!        normally reject it since --alternate does not take an argument.  */
      ,{"a", optional_argument, NULL, 'a'}
      ,{"defsym", required_argument, NULL, OPTION_DEFSYM}
      ,{"dump-config", no_argument, NULL, OPTION_DUMPCONFIG}
      ,{"emulation", required_argument, NULL, OPTION_EMULATION}
--- 437,448 ----
         the end of the preceeding line so that it is simpler to
         selectively add and remove lines from this list.  */
      {"alternate", no_argument, NULL, OPTION_ALTERNATE}
!     /* The next two entries are here to prevent getopt_long_only() from
!        considering that -a or -al is an abbreviation for --alternate.
!        This is necessary because -a=<FILE> is a valid switch but getopt
!        would normally reject it since --alternate does not take an argument.  
*/
      ,{"a", optional_argument, NULL, 'a'}
+     ,{"al", optional_argument, NULL, 'a'}
      ,{"defsym", required_argument, NULL, OPTION_DEFSYM}
      ,{"dump-config", no_argument, NULL, OPTION_DUMPCONFIG}
      ,{"emulation", required_argument, NULL, OPTION_EMULATION}
*************** main (int argc, char ** argv)
*** 1205,1211 ****
      keep_it = 0;
  
    if (!keep_it)
!     unlink_if_ordinary (out_file_name);
  
    input_scrub_end ();
  
--- 1206,1212 ----
      keep_it = 0;
  
    if (!keep_it)
!     unlink (out_file_name);
  
    input_scrub_end ();