* elf32-sh.c (sh_elf_merge_private_data): If ibfd's elf header flags

	not initialized, set them to indicate the SH1 instruction set.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 52be8e345df4f7b42d6a639473283bc043ebc3cd..cf5931fc7a3175bf1a089ea405e880e005347ccf 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 31 22:49:30 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+       * elf32-sh.c (sh_elf_merge_private_data): If ibfd's elf header flags
+       not initialized, set them to indicate the SH1 instruction set.
+
 2000-08-31  Alexandre Oliva  <aoliva@redhat.com>
 
        * acinclude.m4: Include libtool and gettext macros from the

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 9e2d8237ca4ec042d6f16d1c38603c0ab75e150b..1f756ee1dd80e721a0d1c739e737317fe8662206 100644 (file)
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -2344,8 +2344,9 @@ sh_elf_merge_private_data (ibfd, obfd)
 
   if (! elf_flags_init (obfd))
     {
+      /* This happens when ld starts out with a 'blank' output file.  */
       elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = 0;
+      elf_elfheader (obfd)->e_flags = EF_SH1;
     }
   old_flags = elf_elfheader (obfd)->e_flags;
   new_flags = elf_elfheader (ibfd)->e_flags;