Skip to content

Commit 5ea320f

Browse files
authored
Merge pull request #50 from gmbr3/v4_0
Align CRT0 exit function naming
2 parents 9276df8 + be28887 commit 5ea320f

File tree

9 files changed

+26
-18
lines changed

9 files changed

+26
-18
lines changed

gnuefi/crt0-efi-aarch64-local.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,13 @@ _start:
161161
adrp x1, _DYNAMIC
162162
add x1, x1, #:lo12:_DYNAMIC
163163
bl _relocate
164-
cbnz x0, 0f
164+
cbnz x0, .L_exit
165165

166166
ldp x0, x1, [sp, #16]
167167
bl _entry
168168

169-
0: ldp x29, x30, [sp], #32
169+
.L_exit:
170+
ldp x29, x30, [sp], #32
170171
ret
171172

172173
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

gnuefi/crt0-efi-aarch64.S

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@ _start:
3232
adrp x1, _DYNAMIC
3333
add x1, x1, #:lo12:_DYNAMIC
3434
bl _relocate
35-
cbnz x0, 0f
35+
cbnz x0, .L_exit
3636

3737
ldp x0, x1, [sp, #16]
3838
bl _entry
3939

40-
0: ldp x29, x30, [sp], #32
40+
.L_exit:
41+
ldp x29, x30, [sp], #32
4142
ret
4243

4344
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:
44-
45+
4546
.data
4647
dummy0: .4byte 0
4748
dummy1: .4byte 0

gnuefi/crt0-efi-arm.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,13 @@ _start:
163163
sub r0, r0, #0x1000
164164
bl _relocate
165165
teq r0, #0
166-
bne 0f
166+
bne .L_exit
167167

168168
ldmfd sp, {r0-r1}
169169
bl _entry
170170

171-
0: add sp, sp, #12
171+
.L_exit:
172+
add sp, sp, #12
172173
ldr pc, [sp], #4
173174

174175
.L_DYNAMIC:

gnuefi/crt0-efi-ia32-local.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,12 @@ _start:
153153
popl %ebx
154154
popl %ebx
155155
testl %eax,%eax
156-
jne .exit
156+
jne .L_exit
157157

158158
call _entry # call app with "image" and "systab" argument
159159

160-
.exit: leave
160+
.L_exit:
161+
leave
161162
ret
162163

163164
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

gnuefi/crt0-efi-ia32.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ _start:
5858
popl %ebx
5959
popl %ebx
6060
testl %eax,%eax
61-
jne .exit
61+
jne .L_exit
6262

6363
call _entry # call app with "image" and "systab" argument
6464

65-
.exit: leave
65+
.L_exit:
66+
leave
6667
ret
6768

6869
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

gnuefi/crt0-efi-loongarch64.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ _start:
3232
la.local $a0, ImageBase // a0: ImageBase
3333
la.local $a1, _DYNAMIC // a1: DynamicSection
3434
bl _relocate
35-
bnez $a0, 0f
35+
bnez $a0, .L_exit
3636

3737
ld.d $a0, $sp, 8
3838
ld.d $a1, $sp, 16
3939
bl _entry
4040

41-
0: ld.d $ra, $sp, 0
41+
.L_exit:
42+
ld.d $ra, $sp, 0
4243
addi.d $sp, $sp, 24
4344
jr $ra
4445

gnuefi/crt0-efi-riscv64-local.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,13 @@ _start:
159159
lla a0, ImageBase
160160
lla a1, _DYNAMIC
161161
call _relocate
162-
bne a0, zero, 0f
162+
bne a0, zero, .L_exit
163163
ld a1, 8(sp)
164164
ld a0, 0(sp)
165165
call _entry
166166
ld ra, 16(sp)
167-
0: addi sp, sp, 24
167+
.L_exit:
168+
addi sp, sp, 24
168169
ret
169170

170171
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

gnuefi/crt0-efi-riscv64.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ _start:
2727
lla a0, ImageBase
2828
lla a1, _DYNAMIC
2929
call _relocate
30-
bne a0, zero, 0f
30+
bne a0, zero, .L_exit
3131
ld a1, 8(sp)
3232
ld a0, 0(sp)
3333
call _entry
3434
ld ra, 16(sp)
35-
0: addi sp, sp, 24
35+
.L_exit:
36+
addi sp, sp, 24
3637
ret
3738

3839
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

gnuefi/crt0-efi-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ _start:
6060
call _entry
6161
addq $8, %rsp
6262

63-
.exit:
63+
.L_exit:
6464
ret
6565

6666
// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:

0 commit comments

Comments
 (0)