* gdb.java/jv-print.exp: Fix p '' and p ''' tests to deal with

[deliverable/binutils-gdb.git] / ld / ldfile.c

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 8d8310aa1081d6a84b1b0e024126611eaea96e15..9fb2b2dab9e4ef24a29637693d362e776eedab9b 100644 (file)
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -132,7 +132,12 @@ ldfile_try_open_bfd (attempt, entry)
        {
          if (! bfd_check_format (check, bfd_object))
            return true;
-         if (bfd_arch_get_compatible (check, output_bfd) == NULL)
+
+         if ((bfd_arch_get_compatible (check, output_bfd) == NULL)
+             /* XCOFF archives can have 32 and 64 bit objects */
+             && ! (bfd_get_flavour (check) == bfd_target_xcoff_flavour
+                   && bfd_get_flavour (output_bfd) == bfd_target_xcoff_flavour
+                   && bfd_check_format (entry->the_bfd, bfd_archive)))
            {
              einfo (_("%P: skipping incompatible %s when searching for %s\n"),
                     attempt, entry->local_sym_name);
@@ -416,7 +421,7 @@ ldfile_add_arch (name)
 
 void
 ldfile_add_arch (in_name)
-     CONST char *in_name;
+     const char *in_name;
 {
   char *name = xstrdup (in_name);
   search_arch_type *new =
@@ -441,7 +446,7 @@ ldfile_add_arch (in_name)
 
 void
 ldfile_set_output_arch (string)
-     CONST char *string;
+     const char *string;
 {
   const bfd_arch_info_type *arch = bfd_scan_arch (string);