PIE support for i386

diff --git a/Makefile b/Makefile
index 2265fce43958582282ae1c4d92cde5490be9af01..1b9e24369028068ad33e1a57b693ef9938f12e7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
 
 EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
 EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
-CRT_LIBS = lib/crt1.o lib/crti.o lib/crtn.o
+CRT_LIBS = lib/crt1.o lib/Scrt1.o lib/crti.o lib/crtn.o
 STATIC_LIBS = lib/libc.a
 SHARED_LIBS = lib/libc.so
 TOOL_LIBS = lib/musl-gcc.specs

diff --git a/crt/Scrt1.c b/crt/Scrt1.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/crt/i386/Scrt1.s b/crt/i386/Scrt1.s
new file mode 100644 (file)
index 0000000..b0fbe10
--- /dev/null
+++ b/crt/i386/Scrt1.s
@@ -0,0 +1,24 @@
+.weak _init
+.weak _fini
+.text
+.global _start
+_start:
+       xorl %ebp,%ebp
+       popl %ecx
+       movl %esp,%eax
+       andl $-16,%esp
+       pushl %esp
+       pushl %esp
+       pushl %edx
+       call 1f
+1:     addl $_GLOBAL_OFFSET_TABLE_,(%esp)
+       pop %ebx
+       call 1f
+1:     addl $[_fini-.],(%esp)
+       call 1f
+1:     addl $[_init-.],(%esp)
+       pushl %eax
+       pushl %ecx
+       pushl main@GOT(%ebx)
+       call __libc_start_main@plt
+1:     jmp 1b