diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-02-06 14:39:09 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-02-06 14:39:09 -0500 |
| commit | 4ce3cb5cddda7b4ee9643e1f75ee5b8f1f191906 (patch) | |
| tree | 9861037b39b84ed346e0632aef670bf768786461 /crt | |
| parent | f4ad36c4bf23899a3164ebd40ff5781c152bcb01 (diff) | |
| download | musl-4ce3cb5cddda7b4ee9643e1f75ee5b8f1f191906.tar.gz | |
add support for init/finit (constructors and destructors)
this is mainly in hopes of supporting c++ (not yet possible for other
reasons) but will also help applications/libraries which use (and more
often, abuse) the gcc __attribute__((__constructor__)) feature in "C"
code.
x86_64 and arm versions of the new startup asm are untested and may
have minor problems.
Diffstat (limited to 'crt')
| -rw-r--r-- | crt/arm/crt1.s | 7 | ||||
| -rw-r--r-- | crt/arm/crti.s | 7 | ||||
| -rw-r--r-- | crt/arm/crtn.s | 9 | ||||
| -rw-r--r-- | crt/i386/crt1.s | 8 | ||||
| -rw-r--r-- | crt/i386/crti.s | 7 | ||||
| -rw-r--r-- | crt/i386/crtn.s | 5 | ||||
| -rw-r--r-- | crt/x86_64/crt1.s | 8 | ||||
| -rw-r--r-- | crt/x86_64/crti.s | 7 | ||||
| -rw-r--r-- | crt/x86_64/crtn.s | 5 |
9 files changed, 56 insertions, 7 deletions
diff --git a/crt/arm/crt1.s b/crt/arm/crt1.s index 74b90949..ed2a57a2 100644 --- a/crt/arm/crt1.s +++ b/crt/arm/crt1.s @@ -1,13 +1,16 @@ +.weak _init +.weak _fini .global _start _start: mov fp,#0 mov lr,#0 ldr a2,[sp],#4 mov a3,sp - mov a4,#0 + ldr a4,=_fini str fp,[sp,#-4]! str a1,[sp,#-4]! - str fp,[sp,#-4]! + str a4,[sp,#-4]! + ldr a4,=_init ldr a1,=main bl __libc_start_main 1: b 1b diff --git a/crt/arm/crti.s b/crt/arm/crti.s new file mode 100644 index 00000000..2eb23ed5 --- /dev/null +++ b/crt/arm/crti.s @@ -0,0 +1,7 @@ +.section .init +.global _init +_init: + +.section .fini +.global _fini +_fini: diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s new file mode 100644 index 00000000..9d7107d0 --- /dev/null +++ b/crt/arm/crtn.s @@ -0,0 +1,9 @@ +.section .init + tst lr,#1 + moveq pc,lr + bx lr + +.section .fini + tst lr,#1 + moveq pc,lr + bx lr diff --git a/crt/i386/crt1.s b/crt/i386/crt1.s index 3e88c785..66ee11ab 100644 --- a/crt/i386/crt1.s +++ b/crt/i386/crt1.s @@ -1,3 +1,5 @@ +.weak _init +.weak _fini .text .global _start _start: @@ -8,8 +10,10 @@ _start: pushl %esp pushl %esp pushl %edx - pushl %ebp - pushl %ebp + call 1f +1: addl $[_fini-.],(%esp) + call 1f +1: addl $[_init-.],(%esp) pushl %eax pushl %ecx call 1f diff --git a/crt/i386/crti.s b/crt/i386/crti.s new file mode 100644 index 00000000..2eb23ed5 --- /dev/null +++ b/crt/i386/crti.s @@ -0,0 +1,7 @@ +.section .init +.global _init +_init: + +.section .fini +.global _fini +_fini: diff --git a/crt/i386/crtn.s b/crt/i386/crtn.s new file mode 100644 index 00000000..055451ed --- /dev/null +++ b/crt/i386/crtn.s @@ -0,0 +1,5 @@ +.section .init + ret + +.section .fini + ret diff --git a/crt/x86_64/crt1.s b/crt/x86_64/crt1.s index 45cbb9db..50222f1c 100644 --- a/crt/x86_64/crt1.s +++ b/crt/x86_64/crt1.s @@ -1,4 +1,6 @@ /* Written 2011 Nicholas J. Kain, released as Public Domain */ +.weak _init +.weak _fini .text .global _start _start: @@ -9,8 +11,8 @@ _start: andq $-16,%rsp /* align stack pointer */ push %rax /* 8th arg: glibc ABI compatible */ push %rsp /* 7th arg: glibc ABI compatible */ - xor %r8,%r8 /* 5th arg: always 0 */ - xor %rcx,%rcx /* 4th arg: always 0 */ + mov $_fini,%r8 /* 5th arg: fini/dtors function */ + mov $_init,%rcx /* 4th arg: init/ctors function */ mov $main,%rdi /* 1st arg: application entry ip */ call __libc_start_main /* musl init will run the program */ -.L0: jmp .L0 +1: jmp 1b diff --git a/crt/x86_64/crti.s b/crt/x86_64/crti.s new file mode 100644 index 00000000..2eb23ed5 --- /dev/null +++ b/crt/x86_64/crti.s @@ -0,0 +1,7 @@ +.section .init +.global _init +_init: + +.section .fini +.global _fini +_fini: diff --git a/crt/x86_64/crtn.s b/crt/x86_64/crtn.s new file mode 100644 index 00000000..055451ed --- /dev/null +++ b/crt/x86_64/crtn.s @@ -0,0 +1,5 @@ +.section .init + ret + +.section .fini + ret |