aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2001-10-15 07:28:45 +0000
committerAlan Modra <amodra@gmail.com>2001-10-15 07:28:45 +0000
commitbbd7ec4a06eab624965300ea7c0b7de4044811b3 (patch)
tree036a3f0dcc47dea288eda2b56bbc56ded2b4fd25
parent616f30976874a54c304cbfb1d9181f53d54c7713 (diff)
downloadgdb-bbd7ec4a06eab624965300ea7c0b7de4044811b3.zip
gdb-bbd7ec4a06eab624965300ea7c0b7de4044811b3.tar.gz
gdb-bbd7ec4a06eab624965300ea7c0b7de4044811b3.tar.bz2
* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Merge dyn_reloc
counts for aliases instead of aborting. * elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise. * elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise. * elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Set plt.offset to -1 for non-function symbols. * elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise. * elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise. * elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise. * elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise. * elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise. * elf32-i386.c (elf_i386_adjust_dynamic_symbol): Refer to plt.offset instead of plt.refcount when setting to -1.
-rw-r--r--bfd/ChangeLog26
-rw-r--r--bfd/elf32-hppa.c36
-rw-r--r--bfd/elf32-i386.c36
-rw-r--r--bfd/elf32-ppc.c2
-rw-r--r--bfd/elf32-s390.c2
-rw-r--r--bfd/elf64-ppc.c34
-rw-r--r--bfd/elf64-s390.c2
-rw-r--r--bfd/elf64-x86-64.c2
8 files changed, 125 insertions, 15 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5abf7ab..cd8dfa7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,21 @@
+2001-10-15 Alan Modra <amodra@bigpond.net.au>
+ H.J. Lu <hjl@gnu.org>
+
+ * elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Merge dyn_reloc
+ counts for aliases instead of aborting.
+ * elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+ * elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+
+ * elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Set plt.offset
+ to -1 for non-function symbols.
+ * elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
+ * elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+ * elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
+ * elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+ * elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
+ * elf32-i386.c (elf_i386_adjust_dynamic_symbol): Refer to
+ plt.offset instead of plt.refcount when setting to -1.
+
2001-10-12 Nick Clifton <nickc@cambridge.redhat.com>
* elf32-arm.h (elf32_arm_relocate_section): Treat R_ARM_THM_PC22
@@ -84,7 +102,7 @@
2001-10-08 Aldy Hernandez <aldyh@redhat.com>
- * bfd/config.bfd (targ_cpu): Add arm9e-*-elf.
+ * bfd/config.bfd (targ_cpu): Add arm9e-*-elf.
2001-10-06 Stephane Carrez <Stephane.Carrez@worldnet.fr>
@@ -129,7 +147,7 @@
* elf-bfd.h (struct elf_link_hash_entry): Reorganise for better
packing.
- * elf32-mips.c (mips_elf_record_global_got_symbol): Set got.offset
+ * elf32-mips.c (mips_elf_record_global_got_symbol): Set got.offset
to 1 rather than 0 to avoid confusing copy_indirect_symbol.
(mips_elf_sort_hash_table_f): Compare got.offset against 1.
@@ -170,7 +188,7 @@
* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
(elfNN_ia64_aix_add_symbol_hook): Use elf_link_hash_lookup rather
than bfd_link_hash_lookup.
- * elf32-i386 (elf_i386_adjust_dynamic_symbol): Don't do copy
+ * elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't do copy
reloc processing for weakdefs.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
@@ -251,7 +269,7 @@
* libcoff.h: Likewise.
2001-09-30 kaz Kojima <kkojima@rr.iij4u.or.jp>
- Hans-Peter Nilsson <hp@bitrange.com>
+ Hans-Peter Nilsson <hp@bitrange.com>
* elf32-sh.c (sh_elf_howto_table, R_SH_REL32): Make
partial_inplace, matching assembler output. Set src_mask to
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 557b9fe..6531575 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -1142,13 +1142,41 @@ elf32_hppa_copy_indirect_symbol (dir, ind)
edir = (struct elf32_hppa_link_hash_entry *) dir;
eind = (struct elf32_hppa_link_hash_entry *) ind;
- if (edir->dyn_relocs == NULL)
+ if (eind->dyn_relocs != NULL)
{
+ if (edir->dyn_relocs != NULL)
+ {
+ struct elf32_hppa_dyn_reloc_entry **pp;
+ struct elf32_hppa_dyn_reloc_entry *p;
+
+ if (dir != ind->weakdef)
+ abort ();
+
+ /* Add reloc counts against the weak sym to the strong sym
+ list. Merge any entries against the same section. */
+ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+ {
+ struct elf32_hppa_dyn_reloc_entry *q;
+
+ for (q = edir->dyn_relocs; q != NULL; q = q->next)
+ if (q->sec == p->sec)
+ {
+#if RELATIVE_DYNRELOCS
+ q->relative_count += p->relative_count;
+#endif
+ q->count += p->count;
+ *pp = p->next;
+ break;
+ }
+ if (q == NULL)
+ pp = &p->next;
+ }
+ *pp = edir->dyn_relocs;
+ }
+
edir->dyn_relocs = eind->dyn_relocs;
eind->dyn_relocs = NULL;
}
- else if (eind->dyn_relocs != NULL)
- abort ();
_bfd_elf_link_hash_copy_indirect (dir, ind);
}
@@ -1844,6 +1872,8 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index e249304..f5e6455 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -637,13 +637,39 @@ elf_i386_copy_indirect_symbol (dir, ind)
edir = (struct elf_i386_link_hash_entry *) dir;
eind = (struct elf_i386_link_hash_entry *) ind;
- if (edir->dyn_relocs == NULL)
+ if (eind->dyn_relocs != NULL)
{
+ if (edir->dyn_relocs != NULL)
+ {
+ struct elf_i386_dyn_relocs **pp;
+ struct elf_i386_dyn_relocs *p;
+
+ if (dir != ind->weakdef)
+ abort ();
+
+ /* Add reloc counts against the weak sym to the strong sym
+ list. Merge any entries against the same section. */
+ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+ {
+ struct elf_i386_dyn_relocs *q;
+
+ for (q = edir->dyn_relocs; q != NULL; q = q->next)
+ if (q->sec == p->sec)
+ {
+ q->pc_count += p->pc_count;
+ q->count += p->count;
+ *pp = p->next;
+ break;
+ }
+ if (q == NULL)
+ pp = &p->next;
+ }
+ *pp = edir->dyn_relocs;
+ }
+
edir->dyn_relocs = eind->dyn_relocs;
eind->dyn_relocs = NULL;
}
- else if (eind->dyn_relocs != NULL)
- abort ();
_bfd_elf_link_hash_copy_indirect (dir, ind);
}
@@ -1086,7 +1112,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
object, or if all references were garbage collected. In
such a case, we don't actually need to build a procedure
linkage table, and we can just do a PC32 reloc instead. */
- h->plt.refcount = -1;
+ h->plt.offset = (bfd_vma) -1;
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
}
@@ -1098,7 +1124,7 @@ elf_i386_adjust_dynamic_symbol (info, h)
check_relocs. We can't decide accurately between function and
non-function syms in check-relocs; Objects loaded later in
the link may change h->type. So fix it now. */
- h->plt.refcount = -1;
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index f314349..28bba65 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -1797,6 +1797,8 @@ ppc_elf_adjust_dynamic_symbol (info, h)
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index c8f5a8f..ca51540 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -998,6 +998,8 @@ elf_s390_adjust_dynamic_symbol (info, h)
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index d3cdbec..1bbd253 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -1794,13 +1794,39 @@ ppc64_elf_copy_indirect_symbol (dir, ind)
edir = (struct ppc_link_hash_entry *) dir;
eind = (struct ppc_link_hash_entry *) ind;
- if (edir->dyn_relocs == NULL)
+ if (eind->dyn_relocs != NULL)
{
+ if (edir->dyn_relocs != NULL)
+ {
+ struct ppc_dyn_relocs **pp;
+ struct ppc_dyn_relocs *p;
+
+ if (dir != ind->weakdef)
+ abort ();
+
+ /* Add reloc counts against the weak sym to the strong sym
+ list. Merge any entries against the same section. */
+ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+ {
+ struct ppc_dyn_relocs *q;
+
+ for (q = edir->dyn_relocs; q != NULL; q = q->next)
+ if (q->sec == p->sec)
+ {
+ q->pc_count += p->pc_count;
+ q->count += p->count;
+ *pp = p->next;
+ break;
+ }
+ if (q == NULL)
+ pp = &p->next;
+ }
+ *pp = edir->dyn_relocs;
+ }
+
edir->dyn_relocs = eind->dyn_relocs;
eind->dyn_relocs = NULL;
}
- else if (eind->dyn_relocs != NULL)
- abort ();
_bfd_elf_link_hash_copy_indirect (dir, ind);
}
@@ -2366,6 +2392,8 @@ ppc64_elf_adjust_dynamic_symbol (info, h)
}
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index aeba855..ebe30f5 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -976,6 +976,8 @@ elf_s390_adjust_dynamic_symbol (info, h)
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 3215421..9be552d 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -854,6 +854,8 @@ elf64_x86_64_adjust_dynamic_symbol (info, h)
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the