2001-11-02 H.J. Lu <hjl@gnu.org>

	* elf32-mips.c (mips_elf_calculate_relocation): Don't create
	dynamic relocation for symbols defined in regular objects when
	creating executables.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 83390338bb415bd917a989b914ade3dd1e1a685a..2870723e77a0a719bcc8607f1e68c7a06d42f0cc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-02  H.J. Lu  <hjl@gnu.org>
+
+       * elf32-mips.c (mips_elf_calculate_relocation): Don't create
+       dynamic relocation for symbols defined in regular objects when
+       creating executables.
+
 2001-11-02  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * configure.in (ALL_LINGUAS): Add "fr".

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 7fee3c56ac6d3b2d8e682beb99a43ab248604d3f..6b0c7a46adf929c20d3de882a0249f9e78b3c023 100644 (file)
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -6321,8 +6321,10 @@ mips_elf_calculate_relocation (abfd,
       if ((info->shared
           || (elf_hash_table (info)->dynamic_sections_created
               && h != NULL
-              && ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
-                  != 0)))
+              && ((h->root.elf_link_hash_flags
+                   & ELF_LINK_HASH_DEF_DYNAMIC) != 0)
+              && ((h->root.elf_link_hash_flags
+                   & ELF_LINK_HASH_DEF_REGULAR) == 0)))
          && (input_section->flags & SEC_ALLOC) != 0)
        {
          /* If we're creating a shared library, or this relocation is