aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoern Rennecke <joern.rennecke@embecosm.com>2000-08-31 22:15:42 +0000
committerJoern Rennecke <joern.rennecke@embecosm.com>2000-08-31 22:15:42 +0000
commita39b79b9977f6429f5e7928a65c5cabc92181192 (patch)
tree2cc9c2991cce448cbaae1103292aa5b4bed7fe3f
parent29f8404ce72d2786d7167614b07a6fe11dd91298 (diff)
downloadgdb-a39b79b9977f6429f5e7928a65c5cabc92181192.zip
gdb-a39b79b9977f6429f5e7928a65c5cabc92181192.tar.gz
gdb-a39b79b9977f6429f5e7928a65c5cabc92181192.tar.bz2
* 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 52be8e3..cf5931f 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 9e2d823..1f756ee 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;