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>

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ee30aaf1a82d55ef80669ad861fcc662cc7c3d02..9aab1c647622c6f5912cdba968890d825b8f1b37 100644 (file)
--- 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 90efba8dc9bc824f2e0397f6eb3bb4fedf225d12..e4dbf9da0964a53328b142455dc4610b82c53eba 100644 (file)
--- 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