From 8e140239aeb0a5912ca04a164b25d31c3bbb4fc6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 9 Sep 1998 18:51:27 +0000 Subject: Pass pointer to _dl_main_searchlist not _dl_default_scope to _dl_init_next. 1998-09-09 18:48 Ulrich Drepper * sysdeps/powerpc/dl-start.S (_start): Pass pointer to _dl_main_searchlist not _dl_default_scope to _dl_init_next. Patch by Benjamin Kosnik . --- ChangeLog | 6 ++++++ sysdeps/powerpc/dl-start.S | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ea1b50..06d912b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-09-09 18:48 Ulrich Drepper + + * sysdeps/powerpc/dl-start.S (_start): Pass pointer to + _dl_main_searchlist not _dl_default_scope to _dl_init_next. + Patch by Benjamin Kosnik . + 1998-09-09 Mark Kettenis * elf/dl-close.c (_dl_close): Don't free imap->l_origin if it is diff --git a/sysdeps/powerpc/dl-start.S b/sysdeps/powerpc/dl-start.S index 91c0896..7865bb6 100644 --- a/sysdeps/powerpc/dl-start.S +++ b/sysdeps/powerpc/dl-start.S @@ -49,13 +49,13 @@ ENTRY(_start) mflr %r31 /* the address of _start in r30, */ mr %r30,%r3 -/* &_dl_argc in 29, &_dl_argv in 27, and _dl_default_scope in 28. */ - lwz %r28,_dl_default_scope@got(%r31) +/* &_dl_argc in 29, &_dl_argv in 27, and _dl_main_searchlist in 28. */ + lwz %r28,_dl_main_searchlist@got(%r31) lwz %r29,_dl_argc@got(%r31) lwz %r27,_dl_argv@got(%r31) 0: -/* Set initfunc = _dl_init_next(_dl_default_scope[2]) */ - lwz %r3,8(%r28) +/* Set initfunc = _dl_init_next(_dl_main_searchlist) */ + lwz %r3,0(%r28) bl _dl_init_next@plt /* If initfunc is NULL, we exit the loop; otherwise, */ cmpwi %r3,0 -- cgit v1.1