summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorKurt Miller <kurt@cvs.openbsd.org>2009-02-16 14:17:52 +0000
committerKurt Miller <kurt@cvs.openbsd.org>2009-02-16 14:17:52 +0000
commit7b6b94111a9292f433eef65e1ea39265309976a8 (patch)
tree4482afa8e290e878511a6c8e7a05ecf544054860 /libexec
parent2d500347293b67c77054ce0f58fff5d31288bff1 (diff)
Fix passing of ps_strings, cleanup and obj_main values to _start() in crt0.
looks correct kettenis@
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.so/i386/ldasm.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S
index b5248e33c77..2052a03e38d 100644
--- a/libexec/ld.so/i386/ldasm.S
+++ b/libexec/ld.so/i386/ldasm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldasm.S,v 1.10 2006/05/03 16:10:52 drahn Exp $ */
+/* $OpenBSD: ldasm.S,v 1.11 2009/02/16 14:17:51 kurt Exp $ */
/*
* Copyright (c) 2002 Dale Rahn
@@ -68,13 +68,13 @@ _dl_start:
call _dl_boot@PLT # _dl_boot(argv,envp,loff,dl_data)
- addl $5*4,%esp # pop args
+ addl $7*4,%esp # pop args
addl $DL_DATA_SIZE,%esp # return dl_data
- popl %ebx # %ebx = ps_strings - XXXDSR
- popl %edx # %edx = cleanup - XXXDSR
- popl %ecx # %ecx = obj_main - XXXDSR
+ popl %ebx # %ebx = ps_strings
+ movl $0,%edx # %edx = cleanup - XXXDSR
+ movl $0,%ecx # %ecx = obj_main - XXXDSR
jmp *%eax