From 733ca93a45e09a3f4e04004943fe1051d4cedff5 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 16 Apr 2009 15:22:05 +0000 Subject: * elf/dl-open.c (_dl_open): Bump GL(dl_nns) to 1 if no libraries are dlopened in statically linked program even for __LM_ID_CALLER. 2009-04-16 Jakub Jelinek * elf/dl-open.c (_dl_open): Bump GL(dl_nns) to 1 if no libraries are dlopened in statically linked program even for __LM_ID_CALLER. --- ChangeLog | 5 +++++ elf/dl-open.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7abd8a13c..902c3c7496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-16 Jakub Jelinek + + * elf/dl-open.c (_dl_open): Bump GL(dl_nns) to 1 if no libraries + are dlopened in statically linked program even for __LM_ID_CALLER. + 2009-04-16 Ulrich Drepper * resolv/res_send.c (send_dg): Don't switch into single-request diff --git a/elf/dl-open.c b/elf/dl-open.c index 3799669cee..458cf0cd13 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -580,7 +580,8 @@ no more namespaces available for dlmopen()")); _dl_signal_error (EINVAL, file, NULL, N_("invalid target namespace in dlmopen()")); #ifndef SHARED - else if (nsid == LM_ID_BASE && GL(dl_ns)[LM_ID_BASE]._ns_loaded == NULL + else if ((nsid == LM_ID_BASE || nsid == __LM_ID_CALLER) + && GL(dl_ns)[LM_ID_BASE]._ns_loaded == NULL && GL(dl_nns) == 0) GL(dl_nns) = 1; #endif -- cgit v1.2.3