summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/mips/dl-machine.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 806d42df17..365fda8e65 100644
--- 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 6d9570542b..2a19126208 100644
--- 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