aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/ecoff.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 072c500..c565891 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
Mon Jun 6 10:57:28 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
+ * ecoff.c (ecoff_bfd_copy_private_bfd_data): Don't try to copy
+ data to a non-ECOFF file.
+
* libbfd-in.h: Add warning that libbfd.h is a generated file.
* libbfd.h: Rebuilt.
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
index 83a3c22..64661cd 100644
--- a/bfd/ecoff.c
+++ b/bfd/ecoff.c
@@ -2178,7 +2178,11 @@ ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
size_t c;
boolean local;
- BFD_ASSERT (ibfd->xvec == obfd->xvec);
+ /* This function is selected based on the input vector. We only
+ want to copy information over if the output BFD also uses ECOFF
+ format. */
+ if (bfd_get_flavour (obfd) != bfd_target_ecoff_flavour)
+ return true;
/* Copy the GP value and the register masks. */
ecoff_data (obfd)->gp = ecoff_data (ibfd)->gp;