aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/alpha/dl-machine.h4
-rw-r--r--sysdeps/sparc/sparc32/dl-machine.h8
-rw-r--r--sysdeps/sparc/sparc64/dl-machine.h8
4 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index aae849ab69..70327fe48b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-09-11 20:46 Richard Henderson <rth@cygnus.com>
+
+ * sysdeps/alpha/dl-machine.h (_dl_start_user): Pass pointer to
+ _dl_main_searchlist not _dl_default_scope to _dl_init_next.
+ * sysdeps/sparc/sparc32/dl-machine.h (_dl_start_user): Likewise.
+ * sysdeps/sparc/sparc64/dl-machine.h (_dl_start_user): Likewise.
+
1998-09-11 Ulrich Drepper <drepper@cygnus.com>
* resolv/res_init.c (res_init): Handle resolv.conf file with only
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 648fb78ab0..b63661f6f3 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -251,8 +251,8 @@ _dl_start_user:
subq $2, $1, $2
s8addq $1, $sp, $sp
stq $2, 0($sp)
- /* Load _dl_default_scope[2] into s1 to pass to _dl_init_next. */
-0: ldq $10, _dl_default_scope+16
+ /* Load _dl_main_searchlist into s1 to pass to _dl_init_next. */
+0: ldq $10, _dl_main_searchlist
/* Call _dl_init_next to return the address of an initializer
function to run. */
1: mov $10, $16
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index fd1b9b77f2..da15e94a69 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -230,11 +230,11 @@ _dl_start_user:
st %i4, [%i1+4]
bne 23b
add %i1, 8, %i1
- /* Load _dl_default_scope[2] to pass to _dl_init_next. */
-3: sethi %hi(_dl_default_scope), %g1
- or %g1, %lo(_dl_default_scope), %g1
+ /* Load _dl_main_searchlist to pass to _dl_init_next. */
+3: sethi %hi(_dl_main_searchlist), %g1
+ or %g1, %lo(_dl_main_searchlist), %g1
ld [%l7+%g1], %l1
- ld [%l1+2*4], %l1
+ ld [%l1], %l1
/* Call _dl_init_next to return the address of an initializer to run. */
4: call _dl_init_next
mov %l1, %o0
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 3faac558a8..788e239779 100644
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -338,11 +338,11 @@ _dl_start_user:
stx %i4, [%i1+8]
brnz,pt %i3, 13b
add %i1, 16, %i1
- /* Load _dl_default_scope[2] to pass to _dl_init_next. */
-2: sethi %hi(_dl_default_scope), %g2
- or %g2, %lo(_dl_default_scope), %g2
+ /* Load _dl_main_searchlist to pass to _dl_init_next. */
+2: sethi %hi(_dl_main_searchlist), %g2
+ or %g2, %lo(_dl_main_searchlist), %g2
ldx [%l7+%g2], %g2
- ldx [%g2+2*8], %l1
+ ldx [%g2], %l1
/* Call _dl_init_next to return the address of an initializer to run. */
3: call _dl_init_next
mov %l1, %o0