From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 3 May 2012 00:56:55 +0000 (-0400)
Subject: remove attempts to be pie-compatible from i386 crt1.s
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=c9dea48f84cd772ac250c091356dd6ef956ea3f6;hp=485fb14ab414ef7fde4469a51b116281758a4aa0

remove attempts to be pie-compatible from i386 crt1.s

it does not work; after further consideration, a separate Scrt1.s for
pie really is essential. it would be nice if the unified approach
worked, but the linker fails to generate the correct PLT entries and
instead puts textrels in the main program, which don't work because
the kernel maps the text read-only.

new Scrt1.s will be committed soon in place of this.
---

diff --git a/crt/i386/crt1.s b/crt/i386/crt1.s
index 66ee11ab..f520745c 100644
--- a/crt/i386/crt1.s
+++ b/crt/i386/crt1.s
@@ -10,13 +10,10 @@ _start:
 	pushl %esp
 	pushl %esp
 	pushl %edx
-	call 1f
-1:	addl $[_fini-.],(%esp)
-	call 1f
-1:	addl $[_init-.],(%esp)
+	pushl $_fini
+	pushl $_init
 	pushl %eax
 	pushl %ecx
-	call 1f
-1:	addl $[main-.],(%esp)
+	pushl $main
 	call __libc_start_main
 1:	jmp 1b