about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-09 18:51:27 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-09 18:51:27 +0000
commit8e140239aeb0a5912ca04a164b25d31c3bbb4fc6 (patch)
tree898f8024306a9f6ee7c51d1cb9caf31aa7577464
parent78acf6717ae6d5ffe507212af07af7ebd8a860e7 (diff)
downloadglibc-8e140239aeb0a5912ca04a164b25d31c3bbb4fc6.tar.gz
glibc-8e140239aeb0a5912ca04a164b25d31c3bbb4fc6.tar.xz
glibc-8e140239aeb0a5912ca04a164b25d31c3bbb4fc6.zip
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>.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/powerpc/dl-start.S8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ea1b50062..06d912b919 100644
--- 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 91c0896a8f..7865bb6dc2 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