aboutsummaryrefslogtreecommitdiff
path: root/malloc/arena.c
diff options
context:
space:
mode:
Diffstat (limited to 'malloc/arena.c')
-rw-r--r--malloc/arena.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index 202daf15b0..3c9c0ecd86 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -294,14 +294,11 @@ ptmalloc_init (void)
__malloc_initialized = 0;
#ifdef SHARED
- /* In case this libc copy is in a non-default namespace, never use brk.
- Likewise if dlopened from statically linked program. */
- Dl_info di;
- struct link_map *l;
-
- if (_dl_open_hook != NULL
- || (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0
- && l->l_ns != LM_ID_BASE))
+ /* In case this libc copy is in a non-default namespace, never use
+ brk. Likewise if dlopened from statically linked program. The
+ generic sbrk implementation also enforces this, but it is not
+ used on Hurd. */
+ if (!__libc_initial)
__morecore = __failing_morecore;
#endif