From: Clinton Popetz <cpopetz@cpopetz.com>
Date: Sat, 6 May 2000 01:41:50 +0000 (+0000)
Subject: bfd:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6664dfb26da335900bc3276764e24362a54e372;p=binutils-gdb.git

bfd:
	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags):
	Change U802TOC64MAGIC to U803XTOCMAGIC.

include:
	* coff/rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a5b3fc6f6bf..b8c6f356df2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2000-05-04  Michael Snyder  <msnyder@seadog.cygnus.com>
 
 	* elf.c (bfd_elf_get_arch_size): New function, return 32 | 64 | -1.
@@ -127,6 +132,7 @@ Mon May  1 16:56:47 2000  Jim Wilson  <wilson@cygnus.com>
 	* coff-sh.c (bfd_coff_small_swap_table): Fix Fri Apr 28 change.
 	* vms.c (vms_openr_next_archived_file): Return NULL.
 
+>>>>>>> 1.419
 Fri Apr 28 21:34:44 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
 	* coffcode.h Copy changes mistakenly done to libcoff.h in
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 59469fdbc56..26c86203c43 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -1910,7 +1910,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
 
 #ifdef RS6000COFF_C
 #ifdef XCOFF64
-    case U802TOC64MAGIC:
+    case U803XTOCMAGIC:
 #else
     case U802ROMAGIC:
     case U802WRMAGIC:
@@ -2694,7 +2694,7 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
 #ifdef XCOFF64
       if (bfd_get_mach (abfd) == 620 && !strncmp (abfd->xvec->name,"aix", 3))
-	*magicp = U802TOC64MAGIC; 
+	*magicp = U803XTOCMAGIC; 
       else
 #else
     	*magicp = U802TOCMAGIC; 
diff --git a/include/ChangeLog b/include/ChangeLog
index 59559ca9418..1ff5fda3838 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+Fri May  5 16:51:03 2000  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* coff/rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
+
 Mon Apr 24 15:20:51 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
 	* include/coff/rs6k64.h: New file.
diff --git a/include/coff/rs6k64.h b/include/coff/rs6k64.h
index 86d739c96c6..80d8e4c0e9e 100644
--- a/include/coff/rs6k64.h
+++ b/include/coff/rs6k64.h
@@ -14,9 +14,9 @@ struct external_filehdr {
 };
 
         /* IBM RS/6000 */
-#define U802TOC64MAGIC	0757	/* readonly text segments and TOC, XCOFF64 */
+#define U803XTOCMAGIC 0757	/* readonly text segments and TOC, XCOFF64 */
 
-#define BADMAG(x) ((x).f_magic != U802TOC64MAGIC)
+#define BADMAG(x) ((x).f_magic != U803XTOCMAGIC)
 
 #define	FILHDR	struct external_filehdr
 #define	FILHSZ	24
@@ -49,11 +49,11 @@ typedef struct
   unsigned char	entry[8];		/* entry pt.			*/
   unsigned char	o_maxstack[8];	/* max stack size (??) 		*/
   unsigned char o_maxdata[8];	/* max data size (??) 		*/
-  unsigned char	o_resv3[116];		/* reserved 			*/
+  unsigned char	o_resv3[16];		/* reserved 			*/
 }
 AOUTHDR;
 
-#define AOUTSZ 220
+#define AOUTSZ 120
 #define SMALL_AOUTSZ (0)
 #define AOUTHDRSZ 72