Pass pointer to _dl_main_searchlist not _dl_default_scope to _dl_init_next.

1998-09-09 18:48  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/powerpc/dl-start.S (_start): Pass pointer to
	_dl_main_searchlist not _dl_default_scope to _dl_init_next.
	Patch by Benjamin Kosnik <bkoz@cygnus.com>.

diff --git a/ChangeLog b/ChangeLog
index 8ea1b50062abb738d9b511a2592ac5954690c0c2..06d912b919c4c94fb4b2b574126f985565657db5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-09-09 18:48  Ulrich Drepper  <drepper@cygnus.com>
+
+       * sysdeps/powerpc/dl-start.S (_start): Pass pointer to
+       _dl_main_searchlist not _dl_default_scope to _dl_init_next.
+       Patch by Benjamin Kosnik <bkoz@cygnus.com>.
+
 1998-09-09  Mark Kettenis  <kettenis@phys.uva.nl>
 
        * 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 91c0896a8f151e5cab6085b095946bc79eb879f9..7865bb6dc270273eb7d5282379db25965ef88cfc 100644 (file)
--- 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