Added support to LD to select the architecture of an ARM COFF output file

based on the architecture of the first input file.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3b1295c3fe6f67b61a10f4eed1d2ef3a5c1dd8ab..6bcd44a5b9466e0c56674737bf03a28fe5758edc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+Thu May 15 14:31:28 1997  Nick Clifton  <nickc@cygnus.com>
+
+       * cpu-arm.c (compatible):  Allow default machine to be polymorphed
+       into any other machine type.
+
+       * coffcode.h (coff_set_flags):  Initialise flags variable to 0.
+
+       * coff-arm.c (coff_arm_bfd_merge_private_bfd_data):  When merging
+       data into an unitialised destination set its machine type as well.
+
 Thu May 15 16:40:20 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * elflink.h (elf_link_add_object_symbols): Force ELF symbol size

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index c46c03ae5223a8005b723eef18dc72495e2f5c14..941be95cff17a51878d427a62bbda944b095bcf1 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -1970,7 +1970,8 @@ coff_set_flags (abfd, magicp, flagsp)
 #ifdef ARMMAGIC
     case bfd_arch_arm:
       * magicp = ARMMAGIC;
-      if (coff_data (abfd)->flags & F_APCS_26)
+      * flagsp = 0;
+      if (APCS_SET (abfd) && APCS_FLAG (abfd))
        * flagsp = F_APCS26;
       switch (bfd_get_mach (abfd))
        {