Arrgh! Revert last change.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1bff8e9230929aedff0c79669c9c3d8bf6594e32..832bce529e1de36ac4dc1fa3553dff43ff04cb2f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,8 +1,3 @@
-2002-01-29  Alan Modra  <amodra@bigpond.net.au>
-
-       * elf64-ppc.c (func_desc_adjust): Don't supply missing function
-       descriptor symbols.
-
 2002-01-29  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * elf32-i386 (elf_i386_adjust_dynamic_symbol): Do not replace PLT32

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 855722e18ae3b6a7ed40a0cebe8038c2f1cca05d..da339bb512d04c08986aca2b9c46cbf61dcda7a4 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -2494,11 +2494,43 @@ func_desc_adjust (h, inf)
       struct elf_link_hash_entry *fdh;
       boolean force_local;
 
-      /* Find the corresponding function descriptor symbol.  */
+      /* Find the corresponding function descriptor symbol.  Create it
+        as undefined if necessary.  */
 
       fdh = elf_link_hash_lookup (&htab->elf, h->root.root.string + 1,
                                  false, false, true);
 
+      if (fdh == NULL && info->shared)
+       {
+         bfd *abfd;
+         asymbol *newsym;
+
+         /* Create it as undefined.  */
+         if (h->root.type == bfd_link_hash_undefined
+             || h->root.type == bfd_link_hash_undefweak)
+           abfd = h->root.u.undef.abfd;
+         else if (h->root.type == bfd_link_hash_defined
+                  || h->root.type == bfd_link_hash_defweak)
+           abfd = h->root.u.def.section->owner;
+         else
+           abort ();
+         newsym = bfd_make_empty_symbol (abfd);
+         newsym->name = h->root.root.string + 1;
+         newsym->section = bfd_und_section_ptr;
+         newsym->value = 0;
+         newsym->flags = BSF_OBJECT;
+         if (h->root.type == bfd_link_hash_undefweak)
+           newsym->flags |= BSF_WEAK;
+
+         if ( !(_bfd_generic_link_add_one_symbol
+                (info, abfd, newsym->name, newsym->flags,
+                 newsym->section, newsym->value, NULL, false, false,
+                 (struct bfd_link_hash_entry **) &fdh)))
+           {
+             return false;
+           }
+       }
+
       if (fdh != NULL
          && (fdh->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0
          && (info->shared