Fri Dec 13 13:18:49 1996 Dan Wilder <dan@gasboy.com>

	* coffcode.h (coff_set_flags): Use MC68KBCSMAGIC for bfd_arch_m68k
	if NAMES_HAVE_UNDERSCORE is defined.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1c0014f6c6f6463c7cb191b6832dbe69bb2f60c7..425d392d614a77c4361129a5def7c6602ba24407 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 13 13:18:49 1996  Dan Wilder  <dan@gasboy.com>
+
+       * coffcode.h (coff_set_flags): Use MC68KBCSMAGIC for bfd_arch_m68k
+       if NAMES_HAVE_UNDERSCORE is defined.
+
 Thu Dec 12 15:07:20 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
        * elf32-ppc.c (ppc_elf_check_relocs): Move R_PPC_PLTREL24 into the

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 508f75e0639b561e5ade2d03eb4651145fe513af..347854accb60e2ea17e64a449100f842d76ec5ac 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -1931,9 +1931,14 @@ coff_set_flags (abfd, magicp, flagsp)
     case bfd_arch_m68k:
 #ifdef APOLLOM68KMAGIC
       *magicp = APOLLO_COFF_VERSION_NUMBER;
+#else
+      /* NAMES_HAVE_UNDERSCORE may be defined by coff-u68k.c.  */
+#ifdef NAMES_HAVE_UNDERSCORE
+      *magicp = MC68KBCSMAGIC;
 #else
       *magicp = MC68MAGIC;
 #endif
+#endif
 #ifdef LYNXOS
       /* Just overwrite the usual value if we're doing Lynx. */
       *magicp = LYNXCOFFMAGIC;
@@ -2217,8 +2222,14 @@ coff_compute_section_file_positions (abfd)
 #ifndef I960
       /* make sure that this section is of the right size too */
       if ((abfd->flags & EXEC_P) == 0)
-       current->_raw_size = BFD_ALIGN (current->_raw_size,
-                                       1 << current->alignment_power);
+       {
+         bfd_size_type old_size;
+
+         old_size = current->_raw_size;
+         current->_raw_size = BFD_ALIGN (current->_raw_size,
+                                         1 << current->alignment_power);
+         sofar += current->_raw_size - old_size;
+       }
       else
        {
          old_sofar = sofar;
@@ -3663,6 +3674,7 @@ coff_slurp_reloc_table (abfd, asect, symbols)
          (*_bfd_error_handler)
            ("%s: illegal relocation type %d at address 0x%lx",
             bfd_get_filename (abfd), dst.r_type, (long) dst.r_vaddr);
+         bfd_set_error (bfd_error_bad_value);
          return false;
        }
     }