aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2002-11-07 13:28:04 +0000
committerHans-Peter Nilsson <hp@axis.com>2002-11-07 13:28:04 +0000
commit205cfeb0bfa7167fca219759e688f3ea636e8742 (patch)
tree6451cab2af7f50b3cf8a39777189746b57e471d9
parent1790e8ab279f483a915380e086b365e2cacdfe6f (diff)
downloadgdb-205cfeb0bfa7167fca219759e688f3ea636e8742.zip
gdb-205cfeb0bfa7167fca219759e688f3ea636e8742.tar.gz
gdb-205cfeb0bfa7167fca219759e688f3ea636e8742.tar.bz2
* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOT,
case R_CRIS_32_GOT>: Correct test for filling in constant .got contents, enabling for a non-DSO, for symbols defined in the program with --export-dynamic.
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elf32-cris.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d97edd2..941da8a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-07 Hans-Peter Nilsson <hp@axis.com>
+
+ * elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOT,
+ case R_CRIS_32_GOT>: Correct test for filling in constant .got
+ contents, enabling for a non-DSO, for symbols defined in the
+ program with --export-dynamic.
+
2002-11-07 Alan Modra <amodra@bigpond.net.au>
* elf64-ppc.c: Comment typo fixes.
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 8eff52d..dfbdbe7 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1022,7 +1022,8 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
BFD_ASSERT (off != (bfd_vma) -1);
if (!elf_hash_table (info)->dynamic_sections_created
- || (! info->shared && h->dynindx == -1)
+ || (! info->shared
+ && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
|| (info->shared
&& (info->symbolic || h->dynindx == -1)
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))