From a39b79b9977f6429f5e7928a65c5cabc92181192 Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Thu, 31 Aug 2000 22:15:42 +0000 Subject: [PATCH] * elf32-sh.c (sh_elf_merge_private_data): If ibfd's elf header flags not initialized, set them to indicate the SH1 instruction set. --- bfd/ChangeLog | 5 +++++ bfd/elf32-sh.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 52be8e345d..cf5931fc7a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 31 22:49:30 2000 J"orn Rennecke + + * 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 * acinclude.m4: Include libtool and gettext macros from the diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 9e2d8237ca..1f756ee1dd 100644 --- 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;