summaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorClinton Popetz <cpopetz@cpopetz.com>2000-05-06 01:41:50 +0000
committerClinton Popetz <cpopetz@cpopetz.com>2000-05-06 01:41:50 +0000
commit7d6fd216487165899a1eecb6d5ac95657ab2767d (patch)
treeaa518166eea061108283c7850997ecf99203c093 /bfd
parentacf6fc9f47d3bddc8ac4bd30e0aa0eab521433cf (diff)
downloadbinutils-redhat-7d6fd216487165899a1eecb6d5ac95657ab2767d.tar.gz
bfd:
* coffcode.h (coff_set_arch_mach_hook, coff_set_flags): Change U802TOC64MAGIC to U803XTOCMAGIC. include: * coff/rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/coffcode.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a5b3fc6f6b..b8c6f356df 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 59469fdbc5..26c86203c4 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;