First suggestion to lift version handling

Christian Jönsson c.christian.joensson@telia.com
Thu Mar 7 05:25:00 GMT 2002


On Tue, Mar 05, 2002 at 02:56:28PM +0100, Christian Jönsson wrote:
> On Tue, Mar 05, 2002 at 01:46:16PM +0100, Christian Jönsson wrote:
> > On Tue, Mar 05, 2002 at 12:13:50PM +0100, Christian Jönsson wrote:
> > > Here's my first suggestion to lift version handling in the binutils
> > > sources, to differ the main branch (experimental) from (any)
> > > prerelease branch. A regeneration of bfd/configure is thus needed.

I've been doing some thinking here. I've considered having 'GNU
assembler version 2.11.93 (prerelease)' instead of 'GNU assembler
2.11.93 (prerelease)' etc., as the 'GNU ld version 2.11.93
(prerelease)'. This would make things a lot easier for me to
implement. However, reading
http://www.gnu.org/prep/standards_18.html#SEC18 I have come to the
conclusion that the inclusion of the word 'version' is less standrad
conforming as it is without it. I thus suggest removal from ldvers.c.


So here's the next suggestions.

For both the main and the 2.12 branch:



2002-03-07  Christian Jönsson  <c.christian.joensson@telia.com>

	* version.c (print_version): Let version output be 'progname'
        (GNU binutils) to be more standard conforming.



*** binutils/version.c.orig	Fri Jan 18 12:28:42 2002
--- binutils/version.c	Thu Mar  7 13:48:49 2002
***************
*** 31,37 ****
  {
    /* This output is intended to follow the GNU standards document.  */
    /* xgettext:c-format */
!   printf ("GNU %s %s\n", name, BFD_VERSION_STRING);
    printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
    printf (_("\
  This program is free software; you may redistribute it under the terms of\n\
--- 31,37 ----
  {
    /* This output is intended to follow the GNU standards document.  */
    /* xgettext:c-format */
!   printf ("%s (GNU binutils) %s\n", name, BFD_VERSION_STRING);
    printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
    printf (_("\
  This program is free software; you may redistribute it under the terms of\n\



2002-03-07  Christian Jönsson  <c.christian.joensson@telia.com>

	* ldver.c (ldversion): Let version output be ld
        (GNU binutils) to be more standard conforming.



*** ld/ldver.c.orig	Thu Mar  7 12:19:05 2002
--- ld/ldver.c	Thu Mar  7 13:49:11 2002
***************
*** 35,41 ****
       int noisy;
  {
    /* Output for noisy == 2 is intended to follow the GNU standards.  */
!   fprintf (stdout, _("GNU ld version %s\n"), BFD_VERSION_STRING);
  
    if (noisy & 2)
      {
--- 35,41 ----
       int noisy;
  {
    /* Output for noisy == 2 is intended to follow the GNU standards.  */
!   fprintf (stdout, _("ld (GNU binutils) %s\n"), BFD_VERSION_STRING);
  
    if (noisy & 2)
      {



2002-03-07  Christian Jönsson  <c.christian.joensson@telia.com>

	* as.c (print_version_id): Let version output be as
        (GNU binutils) to be more standard conforming.
        (OPTION_VERSION): Likewise.



*** gas/as.c.orig	Thu Mar  7 12:16:28 2002
--- gas/as.c	Thu Mar  7 13:49:53 2002
***************
*** 207,216 ****
    printed = 1;
  
  #ifdef BFD_ASSEMBLER
!   fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s"),
  	   VERSION, TARGET_ALIAS, BFD_VERSION_STRING);
  #else
!   fprintf (stderr, _("GNU assembler version %s (%s)"), VERSION, TARGET_ALIAS);
  #endif
    fprintf (stderr, "\n");
  }
--- 207,216 ----
    printed = 1;
  
  #ifdef BFD_ASSEMBLER
!   fprintf (stderr, _("as (GNU binutils) %s (%s) using BFD version %s"),
  	   VERSION, TARGET_ALIAS, BFD_VERSION_STRING);
  #else
!   fprintf (stderr, _("as (GNU binutils) %s (%s)"), VERSION, TARGET_ALIAS);
  #endif
    fprintf (stderr, "\n");
  }
***************
*** 524,530 ****
  
  	case OPTION_VERSION:
  	  /* This output is intended to follow the GNU standards document.  */
! 	  printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
  	  printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
  	  printf (_("\
  This program is free software; you may redistribute it under the terms of\n\
--- 524,530 ----
  
  	case OPTION_VERSION:
  	  /* This output is intended to follow the GNU standards document.  */
! 	  printf (_("as (GNU binutils) %s\n"), BFD_VERSION_STRING);
  	  printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
  	  printf (_("\
  This program is free software; you may redistribute it under the terms of\n\



And I'll post the darn fixes for utils-lib.exp, gas-defs.exp. and
ld-lib.exp once I get the hand on regexps.

Cheers,

/ChJ



More information about the Binutils mailing list