summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid O'Brien <obrien@FreeBSD.org>2000-09-25 05:45:14 +0000
committerDavid O'Brien <obrien@FreeBSD.org>2000-09-25 05:45:14 +0000
commit0fb2a4afeb4eb63106331bbb5aa35056322f9b3e (patch)
tree365dd1163e1e107ec243e163f767deb2a6b6931f
parent3b3ef659ba3868dd62c4709fd30bba7a82734aa1 (diff)
downloadgdb-0fb2a4afeb4eb63106331bbb5aa35056322f9b3e.tar.gz
Merge from head: H.J's x86 fix for "nm -l" on shared libraries.
This fixes a problem in using GDB 4.18 on shared libs on FreeBSD/i386 4.1. Approved by: Philip Blundell <philb@gnu.org> Message-Id: <E13bolZ-0004CJ-00@kings-cross.london.uk.eu.org>
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-i386.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ee30aaf1a82..9aab1c64762 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-24 H.J. Lu <hjl@gnu.org>
+
+ From 2000-04-20 H.J. Lu <hjl@gnu.org>
+ * elf32-i386.c (elf_i386_relocate_section): Restrict 1998-12-10
+ patch to symbols defined by a shared object.
+
2000-09-06 Philip Blundell <philb@gnu.org>
Merge from mainline:
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 90efba8dc9b..e4dbf9da096 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1291,7 +1291,9 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
sections against symbols defined externally
in shared libraries. We can't do anything
with them here. */
- || (input_section->flags & SEC_DEBUGGING) != 0)))
+ || ((input_section->flags & SEC_DEBUGGING) != 0
+ && (h->elf_link_hash_flags
+ & ELF_LINK_HASH_DEF_DYNAMIC) != 0))))
{
/* In these cases, we don't need the relocation
value. We check specially because in some