This is the mail archive of the binutils@sourceware.cygnus.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Two minor xcoff64 changes


It was pointed out to me that the AIX headers use "U803XTOCMAGIC" instead of
"U802TOC64MAGIC."  Here's a change to keep the naming consistent.  Also, the
o_resv3 field in the filehdr was misdocumented (in the copy of the docs I have
anyway) to be 116 bytes instead of 16 (a typo.)   So objdump would not read
xcoff64 files created by the AIX compiler.

These are both minor, so I'll commit this if I don't here any complaints.

					-Clint

bfd/ChangeLog:

Fri May  5 16:51:03 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags):
	Change U802TOC64MAGIC to U803XTOCMAGIC.
 
include/ChangeLog:

Fri May  5 16:51:03 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
	* coff/rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
	(BADMAG): Ditto.

 
Index: bfd/coffcode.h
===================================================================
RCS file: /cvs/src/src/bfd/coffcode.h,v
retrieving revision 1.40
diff -c -2 -p -r1.40 coffcode.h
*** coffcode.h	2000/04/29 02:41:36	1.40
--- coffcode.h	2000/05/05 21:53:57
*************** coff_set_arch_mach_hook (abfd, filehdr)
*** 1911,1915 ****
  #ifdef RS6000COFF_C
  #ifdef XCOFF64
!     case U802TOC64MAGIC:
  #else
      case U802ROMAGIC:
--- 1911,1915 ----
  #ifdef RS6000COFF_C
  #ifdef XCOFF64
!     case U803XTOCMAGIC:
  #else
      case U802ROMAGIC:
*************** coff_set_flags (abfd, magicp, flagsp)
*** 2695,2699 ****
  #ifdef XCOFF64
        if (bfd_get_mach (abfd) == 620 && !strncmp (abfd->xvec->name,"aix", 3))
! 	*magicp = U802TOC64MAGIC; 
        else
  #else
--- 2695,2699 ----
  #ifdef XCOFF64
        if (bfd_get_mach (abfd) == 620 && !strncmp (abfd->xvec->name,"aix", 3))
! 	*magicp = U803XTOCMAGIC; 
        else
  #else
Index: include/coff/rs6k64.h
===================================================================
RCS file: /cvs/src/src/include/coff/rs6k64.h,v
retrieving revision 1.1
diff -c -2 -p -r1.1 rs6k64.h
*** rs6k64.h	2000/04/26 15:09:44	1.1
--- rs6k64.h	2000/05/05 21:54:00
*************** struct external_filehdr {
*** 15,21 ****
  
          /* IBM RS/6000 */
! #define U802TOC64MAGIC	0757	/* readonly text segments and TOC, XCOFF64 */
  
! #define BADMAG(x) ((x).f_magic != U802TOC64MAGIC)
  
  #define	FILHDR	struct external_filehdr
--- 15,21 ----
  
          /* IBM RS/6000 */
! #define U803XTOCMAGIC 0757	/* readonly text segments and TOC, XCOFF64 */
  
! #define BADMAG(x) ((x).f_magic != U803XTOCMAGIC)
  
  #define	FILHDR	struct external_filehdr
*************** typedef struct 
*** 50,58 ****
    unsigned char	o_maxstack[8];	/* max stack size (??) 		*/
    unsigned char o_maxdata[8];	/* max data size (??) 		*/
!   unsigned char	o_resv3[116];		/* reserved 			*/
  }
  AOUTHDR;
  
! #define AOUTSZ 220
  #define SMALL_AOUTSZ (0)
  #define AOUTHDRSZ 72
--- 50,58 ----
    unsigned char	o_maxstack[8];	/* max stack size (??) 		*/
    unsigned char o_maxdata[8];	/* max data size (??) 		*/
!   unsigned char	o_resv3[16];		/* reserved 			*/
  }
  AOUTHDR;
  
! #define AOUTSZ 120
  #define SMALL_AOUTSZ (0)
  #define AOUTHDRSZ 72

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]