[src/trunk]: src/libexec/ld.elf_so Fix merge error that broke HPPA

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ec4f16a5bf7
branches:  trunk
changeset: 763584:9ec4f16a5bf7
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Mar 26 21:40:37 2011 +0000

description:
Fix merge error that broke HPPA

diffstat:

 libexec/ld.elf_so/rtld.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 5a8b436f4fc4 -r 9ec4f16a5bf7 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Sat Mar 26 21:31:23 2011 +0000
+++ b/libexec/ld.elf_so/rtld.c  Sat Mar 26 21:40:37 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.141 2011/03/25 18:07:04 joerg Exp $  */
+/*     $NetBSD: rtld.c,v 1.142 2011/03/26 21:40:37 joerg Exp $  */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.141 2011/03/25 18:07:04 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.142 2011/03/26 21:40:37 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1061,6 +1061,8 @@
                void *p;
 #ifdef __HAVE_FUNCTION_DESCRIPTORS
                if (ELF_ST_TYPE(def->st_info) == STT_FUNC) {
+                       p = (void *)_rtld_function_descriptor_alloc(defobj,
+                           def, 0);
                        lookup_mutex_exit();
                        return p;
                }