Module Name: src
Committed By: joerg
Date: Sat Mar 26 21:40:37 UTC 2011
Modified Files:
src/libexec/ld.elf_so: rtld.c
Log Message:
Fix merge error that broke HPPA
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.141 src/libexec/ld.elf_so/rtld.c:1.142
--- src/libexec/ld.elf_so/rtld.c:1.141 Fri Mar 25 18:07:04 2011
+++ src/libexec/ld.elf_so/rtld.c Sat Mar 26 21:40:37 2011
@@ -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;
}
