Index: bfd/coffgen.c
===================================================================
RCS file: /cvs/src/src/bfd/coffgen.c,v
retrieving revision 1.48
diff -c -3 -p -r1.48 coffgen.c
*** bfd/coffgen.c	21 Feb 2005 11:21:29 -0000	1.48
--- bfd/coffgen.c	11 Mar 2005 10:35:38 -0000
*************** coff_print_symbol (abfd, filep, symbol, 
*** 1991,2018 ****
  	  else
  	    val = combined->u.syment.n_value - (unsigned long) root;
  
- #ifndef XCOFF64
  	  fprintf (file,
! 		   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%08lx %s",
  		   combined->u.syment.n_scnum,
  		   combined->u.syment.n_flags,
  		   combined->u.syment.n_type,
  		   combined->u.syment.n_sclass,
! 		   combined->u.syment.n_numaux,
! 		   (unsigned long) val,
! 		   symbol->name);
! #else
! 	  /* Print out the wide, 64 bit, symbol value */
! 	  fprintf (file,
! 		   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%016llx %s",
! 		   combined->u.syment.n_scnum,
! 		   combined->u.syment.n_flags,
! 		   combined->u.syment.n_type,
! 		   combined->u.syment.n_sclass,
! 		   combined->u.syment.n_numaux,
! 		   val,
! 		   symbol->name);
! #endif
  
  	  for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
  	    {
--- 1991,2019 ----
  	  else
  	    val = combined->u.syment.n_value - (unsigned long) root;
  
  	  fprintf (file,
! 		   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) ",
  		   combined->u.syment.n_scnum,
  		   combined->u.syment.n_flags,
  		   combined->u.syment.n_type,
  		   combined->u.syment.n_sclass,
! 		   combined->u.syment.n_numaux);
! 
! 	  /* We used to test for XCOFF64 being defined here in order to
! 	     determine whether we are displaying 64-bit or 32-bit symbol
! 	     values.  But this does not work because XCOFF64 is only defined
! 	     in coff64-rs6000.c just before it includes coffcode.h.  Instead
! 	     we check the symbols's value and see if any of the top 32 bits
! 	     are set.  This is not ideal since it can lead to mixed styles
! 	     in the output, but it does at least mean that 64-bit symbols will
! 	     not be displayed in a truncated fashion.  */
! 	  if (val <= 0xFFFFFFFFULL)
! 	    fprintf (file, "0x%08lx", (unsigned long) val);
! 	  else
! 	    /* Print out the wide, 64 bit, symbol value.  */
! 	    fprintf (file, "0x%016llx", val);
! 
! 	  fprintf (file, " %s", symbol->name);
  
  	  for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
  	    {
*************** coff_print_symbol (abfd, filep, symbol, 
*** 2091,2100 ****
  	      l++;
  	      while (l->line_number)
  		{
! 		  fprintf (file, "\n%4d : 0x%lx",
! 			   l->line_number,
! 			   ((unsigned long)
! 			    (l->u.offset + symbol->section->vma)));
  		  l++;
  		}
  	    }
--- 2092,2107 ----
  	      l++;
  	      while (l->line_number)
  		{
! 		  fprintf (file, "\n%4d : ", l->line_number);
! 
! 		  val = l->u.offset + symbol->section->vma;
! 
! 		  /* See comment about XCOFF64 above.  */
! 		  if (val <= 0xFFFFFFFFULL)
! 		    fprintf (file, "0x%lx", (unsigned long) val);
! 		  else
! 		    fprintf (file, "0x%llx", val);
! 
  		  l++;
  		}
  	    }