summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-sh.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 34927fcaa8f..a30f240e1f5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2006-08-07 Nick Clifton <nickc@redhat.com>
+ * elf32-sh.c (vxworks_object_p): Only check for vxworks target
+ vectors if they are going to be created.
+
+2006-08-07 Nick Clifton <nickc@redhat.com>
+
* configure.in (bfd_elf32_shnbsd_vec): Fix typo.
* configure: Regenerate.
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index f0ebd4fbb2c..849c9c7e3ef 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -74,13 +74,17 @@ static reloc_howto_type sh_vxworks_howto_table[] =
/* Return true if OUTPUT_BFD is a VxWorks object. */
static bfd_boolean
-vxworks_object_p (bfd *abfd)
+vxworks_object_p (bfd *abfd ATTRIBUTE_UNUSED)
{
+#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
extern const bfd_target bfd_elf32_shlvxworks_vec;
extern const bfd_target bfd_elf32_shvxworks_vec;
return (abfd->xvec == &bfd_elf32_shlvxworks_vec
|| abfd->xvec == &bfd_elf32_shvxworks_vec);
+#else
+ return FALSE;
+#endif
}
/* Return the howto table for ABFD. */