GOT refcounting broke non-refcount targets
Alan Modra
amodra@bigpond.net.au
Wed Aug 21 18:23:00 GMT 2002
Applying mainline and branch.
bfd/ChangeLog
* elf-bfd.h (struct elf_backend_data): Add struct elf_backend_data
param to elf_backend_copy_indirect_symbol.
(_bfd_elf_link_hash_copy_indirect): Likewise.
* elflink.h (elf_add_default_symbol, elf_fix_symbol_flags): Adjust
calls to copy_indirect_symbol.
* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
* elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise.
* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
* elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise.
* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Likewise.
* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
* elfxx-mips.c (_bfd_mips_elf_copy_indirect_symbol): Likewise.
* elfxx-mips.h (_bfd_mips_elf_copy_indirect_symbol): Likewise.
* elf.c (_bfd_elf_link_hash_copy_indirect): Likewise. Properly
test refcounts for "used" values.
Index: bfd/elf-bfd.h
===================================================================
RCS file: /cvs/src/src/bfd/elf-bfd.h,v
retrieving revision 1.85
diff -u -p -r1.85 elf-bfd.h
--- bfd/elf-bfd.h 25 Jul 2002 06:54:51 -0000 1.85
+++ bfd/elf-bfd.h 22 Aug 2002 01:13:13 -0000
@@ -717,7 +717,8 @@ struct elf_backend_data
newly created and plt/got refcounts and dynamic indices should not
be copied. */
void (*elf_backend_copy_indirect_symbol)
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
/* Modify any information related to dynamic linking such that the
symbol is not exported. */
@@ -1271,7 +1272,8 @@ extern struct bfd_hash_entry *_bfd_elf_l
extern struct bfd_link_hash_table *_bfd_elf_link_hash_table_create
PARAMS ((bfd *));
extern void _bfd_elf_link_hash_copy_indirect
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
extern void _bfd_elf_link_hash_hide_symbol
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
extern boolean _bfd_elf_link_hash_table_init
Index: bfd/elf.c
===================================================================
RCS file: /cvs/src/src/bfd/elf.c,v
retrieving revision 1.159
diff -u -p -r1.159 elf.c
--- bfd/elf.c 17 Aug 2002 16:09:02 -0000 1.159
+++ bfd/elf.c 22 Aug 2002 01:13:19 -0000
@@ -1418,10 +1418,12 @@ _bfd_elf_link_hash_newfunc (entry, table
old indirect symbol. Also used for copying flags to a weakdef. */
void
-_bfd_elf_link_hash_copy_indirect (dir, ind)
+_bfd_elf_link_hash_copy_indirect (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
bfd_signed_vma tmp;
+ bfd_signed_vma lowest_valid = bed->can_refcount;
/* Copy down any references that we may have already seen to the
symbol which just became indirect. */
@@ -1439,22 +1441,22 @@ _bfd_elf_link_hash_copy_indirect (dir, i
/* Copy over the global and procedure linkage table refcount entries.
These may have been already set up by a check_relocs routine. */
tmp = dir->got.refcount;
- if (tmp <= 0)
+ if (tmp < lowest_valid)
{
dir->got.refcount = ind->got.refcount;
ind->got.refcount = tmp;
}
else
- BFD_ASSERT (ind->got.refcount <= 0);
+ BFD_ASSERT (ind->got.refcount < lowest_valid);
tmp = dir->plt.refcount;
- if (tmp <= 0)
+ if (tmp < lowest_valid)
{
dir->plt.refcount = ind->plt.refcount;
ind->plt.refcount = tmp;
}
else
- BFD_ASSERT (ind->plt.refcount <= 0);
+ BFD_ASSERT (ind->plt.refcount < lowest_valid);
if (dir->dynindx == -1)
{
Index: bfd/elf32-hppa.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-hppa.c,v
retrieving revision 1.88
diff -u -p -r1.88 elf32-hppa.c
--- bfd/elf32-hppa.c 23 Jul 2002 12:29:32 -0000 1.88
+++ bfd/elf32-hppa.c 22 Aug 2002 01:13:22 -0000
@@ -327,7 +327,8 @@ static boolean elf32_hppa_create_dynamic
PARAMS ((bfd *, struct bfd_link_info *));
static void elf32_hppa_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static boolean elf32_hppa_check_relocs
PARAMS ((bfd *, struct bfd_link_info *,
@@ -1145,7 +1146,8 @@ elf32_hppa_create_dynamic_sections (abfd
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-elf32_hppa_copy_indirect_symbol (dir, ind)
+elf32_hppa_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct elf32_hppa_link_hash_entry *edir, *eind;
@@ -1189,7 +1191,7 @@ elf32_hppa_copy_indirect_symbol (dir, in
eind->dyn_relocs = NULL;
}
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
/* Look through the relocs for a section during the first phase, and
Index: bfd/elf32-i386.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-i386.c,v
retrieving revision 1.78
diff -u -p -r1.78 elf32-i386.c
--- bfd/elf32-i386.c 8 Aug 2002 21:38:27 -0000 1.78
+++ bfd/elf32-i386.c 22 Aug 2002 01:13:24 -0000
@@ -45,7 +45,8 @@ static boolean create_got_section
static boolean elf_i386_create_dynamic_sections
PARAMS((bfd *, struct bfd_link_info *));
static void elf_i386_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static int elf_i386_tls_transition
PARAMS ((struct bfd_link_info *, int, int));
@@ -767,7 +768,8 @@ elf_i386_create_dynamic_sections (dynobj
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-elf_i386_copy_indirect_symbol (dir, ind)
+elf_i386_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct elf_i386_link_hash_entry *edir, *eind;
@@ -815,7 +817,7 @@ elf_i386_copy_indirect_symbol (dir, ind)
edir->tls_type = eind->tls_type;
eind->tls_type = GOT_UNKNOWN;
}
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
static int
Index: bfd/elf32-s390.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-s390.c,v
retrieving revision 1.29
diff -u -p -r1.29 elf32-s390.c
--- bfd/elf32-s390.c 23 Jul 2002 12:29:32 -0000 1.29
+++ bfd/elf32-s390.c 22 Aug 2002 01:13:31 -0000
@@ -40,7 +40,8 @@ static boolean create_got_section
static boolean elf_s390_create_dynamic_sections
PARAMS((bfd *, struct bfd_link_info *));
static void elf_s390_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static boolean elf_s390_check_relocs
PARAMS ((bfd *, struct bfd_link_info *, asection *,
const Elf_Internal_Rela *));
@@ -562,7 +563,8 @@ elf_s390_create_dynamic_sections (dynobj
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-elf_s390_copy_indirect_symbol (dir, ind)
+elf_s390_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct elf_s390_link_hash_entry *edir, *eind;
@@ -604,7 +606,7 @@ elf_s390_copy_indirect_symbol (dir, ind)
eind->dyn_relocs = NULL;
}
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
/* Look through the relocs for a section during the first phase, and
Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.62
diff -u -p -r1.62 elf64-ppc.c
--- bfd/elf64-ppc.c 7 Aug 2002 05:23:09 -0000 1.62
+++ bfd/elf64-ppc.c 22 Aug 2002 01:13:36 -0000
@@ -1952,7 +1952,8 @@ static boolean create_got_section
static boolean ppc64_elf_create_dynamic_sections
PARAMS ((bfd *, struct bfd_link_info *));
static void ppc64_elf_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static boolean ppc64_elf_check_relocs
PARAMS ((bfd *, struct bfd_link_info *, asection *,
const Elf_Internal_Rela *));
@@ -2440,7 +2441,8 @@ ppc64_elf_create_dynamic_sections (dynob
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-ppc64_elf_copy_indirect_symbol (dir, ind)
+ppc64_elf_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct ppc_link_hash_entry *edir, *eind;
@@ -2486,7 +2488,7 @@ ppc64_elf_copy_indirect_symbol (dir, ind
edir->is_func_descriptor |= eind->is_func_descriptor;
edir->is_entry |= eind->is_entry;
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
/* Set a flag, used by ppc64_elf_gc_mark_hook, on the entry symbol and
Index: bfd/elf64-s390.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-s390.c,v
retrieving revision 1.30
diff -u -p -r1.30 elf64-s390.c
--- bfd/elf64-s390.c 23 Jul 2002 12:29:33 -0000 1.30
+++ bfd/elf64-s390.c 22 Aug 2002 01:13:37 -0000
@@ -40,7 +40,8 @@ static boolean create_got_section
static boolean elf_s390_create_dynamic_sections
PARAMS((bfd *, struct bfd_link_info *));
static void elf_s390_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static boolean elf_s390_check_relocs
PARAMS ((bfd *, struct bfd_link_info *, asection *,
const Elf_Internal_Rela *));
@@ -508,7 +509,8 @@ elf_s390_create_dynamic_sections (dynobj
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-elf_s390_copy_indirect_symbol (dir, ind)
+elf_s390_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct elf_s390_link_hash_entry *edir, *eind;
@@ -550,7 +552,7 @@ elf_s390_copy_indirect_symbol (dir, ind)
eind->dyn_relocs = NULL;
}
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
/* Look through the relocs for a section during the first phase, and
Index: bfd/elf64-x86-64.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-x86-64.c,v
retrieving revision 1.48
diff -u -p -r1.48 elf64-x86-64.c
--- bfd/elf64-x86-64.c 23 Jul 2002 12:29:33 -0000 1.48
+++ bfd/elf64-x86-64.c 22 Aug 2002 01:13:39 -0000
@@ -134,7 +134,8 @@ static boolean create_got_section
static boolean elf64_x86_64_create_dynamic_sections
PARAMS((bfd *, struct bfd_link_info *));
static void elf64_x86_64_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static boolean elf64_x86_64_check_relocs
PARAMS ((bfd *, struct bfd_link_info *, asection *sec,
const Elf_Internal_Rela *));
@@ -494,7 +495,8 @@ elf64_x86_64_create_dynamic_sections (dy
/* Copy the extra info we tack onto an elf_link_hash_entry. */
static void
-elf64_x86_64_copy_indirect_symbol (dir, ind)
+elf64_x86_64_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct elf64_x86_64_link_hash_entry *edir, *eind;
@@ -536,7 +538,7 @@ elf64_x86_64_copy_indirect_symbol (dir,
eind->dyn_relocs = NULL;
}
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
}
static boolean
Index: bfd/elflink.h
===================================================================
RCS file: /cvs/src/src/bfd/elflink.h,v
retrieving revision 1.184
diff -u -p -r1.184 elflink.h
--- bfd/elflink.h 14 Aug 2002 03:25:48 -0000 1.184
+++ bfd/elflink.h 22 Aug 2002 01:13:48 -0000
@@ -1044,7 +1044,7 @@ elf_add_default_symbol (abfd, info, h, n
| ELF_LINK_HASH_DEF_REGULAR)) == 0);
ht = (struct elf_link_hash_entry *) hi->root.u.i.link;
- (*bed->elf_backend_copy_indirect_symbol) (ht, hi);
+ (*bed->elf_backend_copy_indirect_symbol) (bed, ht, hi);
/* See if the new flags lead us to realize that the symbol must
be dynamic. */
@@ -1116,7 +1116,7 @@ elf_add_default_symbol (abfd, info, h, n
& (ELF_LINK_HASH_DEF_DYNAMIC
| ELF_LINK_HASH_DEF_REGULAR)) == 0);
- (*bed->elf_backend_copy_indirect_symbol) (h, hi);
+ (*bed->elf_backend_copy_indirect_symbol) (bed, h, hi);
/* See if the new flags lead us to realize that the symbol
must be dynamic. */
@@ -3903,7 +3903,7 @@ elf_fix_symbol_flags (h, eif)
struct elf_backend_data *bed;
bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
- (*bed->elf_backend_copy_indirect_symbol) (weakdef, h);
+ (*bed->elf_backend_copy_indirect_symbol) (bed, weakdef, h);
}
}
Index: bfd/elfxx-ia64.c
===================================================================
RCS file: /cvs/src/src/bfd/elfxx-ia64.c,v
retrieving revision 1.56
diff -u -p -r1.56 elfxx-ia64.c
--- bfd/elfxx-ia64.c 30 Jul 2002 05:40:20 -0000 1.56
+++ bfd/elfxx-ia64.c 22 Aug 2002 01:13:51 -0000
@@ -207,7 +207,8 @@ static struct bfd_hash_entry *elfNN_ia64
PARAMS ((struct bfd_hash_entry *entry, struct bfd_hash_table *table,
const char *string));
static void elfNN_ia64_hash_copy_indirect
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
static void elfNN_ia64_hash_hide_symbol
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
static struct bfd_link_hash_table *elfNN_ia64_hash_table_create
@@ -1602,7 +1603,8 @@ elfNN_ia64_new_elf_hash_entry (entry, ta
}
static void
-elfNN_ia64_hash_copy_indirect (xdir, xind)
+elfNN_ia64_hash_copy_indirect (bed, xdir, xind)
+ struct elf_backend_data *bed ATTRIBUTE_UNUSED;
struct elf_link_hash_entry *xdir, *xind;
{
struct elfNN_ia64_link_hash_entry *dir, *ind;
Index: bfd/elfxx-mips.c
===================================================================
RCS file: /cvs/src/src/bfd/elfxx-mips.c,v
retrieving revision 1.20
diff -u -p -r1.20 elfxx-mips.c
--- bfd/elfxx-mips.c 17 Aug 2002 15:31:29 -0000 1.20
+++ bfd/elfxx-mips.c 22 Aug 2002 01:13:58 -0000
@@ -6369,12 +6369,13 @@ _bfd_mips_elf_gc_sweep_hook (abfd, info,
_bfd_elf_link_hash_copy_indirect copy the flags for us. */
void
-_bfd_mips_elf_copy_indirect_symbol (dir, ind)
+_bfd_mips_elf_copy_indirect_symbol (bed, dir, ind)
+ struct elf_backend_data *bed;
struct elf_link_hash_entry *dir, *ind;
{
struct mips_elf_link_hash_entry *dirmips, *indmips;
- _bfd_elf_link_hash_copy_indirect (dir, ind);
+ _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
if (ind->root.type != bfd_link_hash_indirect)
return;
Index: bfd/elfxx-mips.h
===================================================================
RCS file: /cvs/src/src/bfd/elfxx-mips.h,v
retrieving revision 1.5
diff -u -p -r1.5 elfxx-mips.h
--- bfd/elfxx-mips.h 19 Jul 2002 21:34:02 -0000 1.5
+++ bfd/elfxx-mips.h 22 Aug 2002 01:13:58 -0000
@@ -68,7 +68,8 @@ extern boolean _bfd_mips_elf_gc_sweep_ho
PARAMS ((bfd *, struct bfd_link_info *, asection *,
const Elf_Internal_Rela *));
extern void _bfd_mips_elf_copy_indirect_symbol
- PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+ PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+ struct elf_link_hash_entry *));
extern void _bfd_mips_elf_hide_symbol
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
extern boolean _bfd_mips_elf_ignore_discarded_relocs
--
Alan Modra
IBM OzLabs - Linux Technology Centre
More information about the Binutils
mailing list