Mon Jun 10 06:14:03 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* elf/dl-object.c (_dl_loaded): Variable removed.
	(_dl_default_scope): New variable replaces it.
	* elf/link.h (_dl_loaded): Remove variable decl; instead define as
	macro for _dl_default_scope[2].
	(_dl_default_scope): Declare it.
	* sysdeps/i386/dl-machine.h (RTLD_START): Use _dl_default_scope[2]
	instead of _dl_loaded.
	* sysdeps/m68k/dl-machine.h (RTLD_START): Likewise.
	* elf/rtld.c (dl_main): Use _dl_default_scope for symbol lookups.

diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index 74e88749e603dddca34508413ed95f1ea17de834..415216b14a11f460c8627b90b0bed201a12d24ed 100644 (file)
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -252,9 +252,9 @@ _dl_start_user:
        lea (%sp, %d0*4), %sp
        | Push back the modified argument count.
        move.l %d1, -(%sp)
-0:     | Push _dl_loaded as argument in _dl_init_next call below.
-       move.l ([_dl_loaded@GOT, %a5]), %d2
-0:     move.l %d2, -(%sp)
+0:     | Push _dl_default_scope[2] as argument in _dl_init_next call below.
+       move.l ([_dl_default_scope@GOT, %a5]), %d2
+0:     move.l (%d2, 8), -(%sp)
        | Call _dl_init_next to return the address of an initializer
        | function to run.
        bsr.l _dl_init_next@PLTPC