Update.

2000-10-01  Ralf Baechle  <ralf@gnu.org>

	* sysdeps/mips/dl-machine.h (RTLD_START): Fix computation of envp
	argument passed to _dl_init.

diff --git a/ChangeLog b/ChangeLog
index 806d42df17080e34f4dfdd0c3bdc2de4c56d9e3d..365fda8e657d30c19b97fd1860809abcdefcc4ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-01  Ralf Baechle  <ralf@gnu.org>
+
+       * sysdeps/mips/dl-machine.h (RTLD_START): Fix computation of envp
+       argument passed to _dl_init.
+
 2000-09-30  Bruno Haible  <haible@clisp.cons.org>
 
        * locale/programs/charmap-dir.h: New file.

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 6d9570542b98b5b1ae0426b139d402c029c5edc5..2a191262089829cdd03b67a19cb1e6963e219de2 100644 (file)
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -468,7 +468,9 @@ _dl_start_user:\n\
        lw $4, _dl_loaded\n\
        lw $5, 0($29)\n\
        la $6, 4($29)\n\
-       la $7, 8($29)\n\
+       sll $7, $5, 2\n\
+       addu $7, $7, $6\n\
+       addu $7, $7, 4\n\
        subu $29, 16\n\
        # Call the function to run the initializers.\n\
        jal _dl_init