summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoern Rennecke <joern.rennecke@arc.com>2000-08-31 22:15:42 +0000
committerJoern Rennecke <joern.rennecke@arc.com>2000-08-31 22:15:42 +0000
commit2b4e0fb05a84597a4662a5c070eebd47173f982c (patch)
tree8a368b54d2cd0c724b6a6feb9874a16d7b8da6c4
parent1b7ea2ad2e54cebdf2c17f3091e4a06fb589f025 (diff)
downloadgdb-2b4e0fb05a84597a4662a5c070eebd47173f982c.tar.gz
* elf32-sh.c (sh_elf_merge_private_data): If ibfd's elf header flags
not initialized, set them to indicate the SH1 instruction set.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-sh.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 52be8e345df..cf5931fc7a3 100644
--- 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 9e2d8237ca4..1f756ee1dd8 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;