Commit c1cc63e5ff1f2a9b7621051475085cb0b6303ecb | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2024-09-18 03:33:08+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-09-23 17:26:30-07:00
log	c1cc63e5ff1f2a9b7621051475085cb0b6303ecb
tree	1e1c2a03337a72f8858ebade7c7be8802cb85151
parent	b19d0fb0fd3e4ff023968e77f01848ffb9dce360

See: https://github.com/ziglang/zig/issues/21315

6 files changed, 22 insertions(+), 11 deletions(-)

lib/libc/glibc/sysdeps/mips/mips32/crtn.S+4-2

...	...	@@ -42,7 +42,8 @@
42	42	lw $31,28($sp)
43	43	.set noreorder
44	44	.set nomacro
45		j $31
	45	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	46	jr $31
46	47	addiu $sp,$sp,32
47	48	.set macro
48	49	.set reorder
...	...	@@ -51,7 +52,8 @@
51	52	lw $31,28($sp)
52	53	.set noreorder
53	54	.set nomacro
54		j $31
	55	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	56	jr $31
55	57	addiu $sp,$sp,32
56	58	.set macro
57	59	.set reorder

lib/libc/glibc/sysdeps/mips/mips64/n32/crtn.S+4-2

...	...	@@ -43,7 +43,8 @@
43	43	ld $28,0($sp)
44	44	.set noreorder
45	45	.set nomacro
46		j $31
	46	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	47	jr $31
47	48	addiu $sp,$sp,16
48	49	.set macro
49	50	.set reorder
...	...	@@ -53,7 +54,8 @@
53	54	ld $28,0($sp)
54	55	.set noreorder
55	56	.set nomacro
56		j $31
	57	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	58	jr $31
57	59	addiu $sp,$sp,16
58	60	.set macro
59	61	.set reorder

lib/libc/glibc/sysdeps/mips/mips64/n64/crtn.S+4-2

...	...	@@ -43,7 +43,8 @@
43	43	ld $28,0($sp)
44	44	.set noreorder
45	45	.set nomacro
46		j $31
	46	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	47	jr $31
47	48	daddiu $sp,$sp,16
48	49	.set macro
49	50	.set reorder
...	...	@@ -53,7 +54,8 @@
53	54	ld $28,0($sp)
54	55	.set noreorder
55	56	.set nomacro
56		j $31
	57	/* zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315 */
	58	jr $31
57	59	daddiu $sp,$sp,16
58	60	.set macro
59	61	.set reorder

lib/libc/glibc/sysdeps/unix/mips/sysdep.h+2-1

...	...	@@ -39,7 +39,8 @@
39	39	.end function; \
40	40	.size function,.-function
41	41
42		#define ret j ra ; nop
	42	// zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315
	43	#define ret jr ra ; nop
43	44
44	45	#undef PSEUDO_END
45	46	#define PSEUDO_END(sym) cfi_endproc; .end sym; .size sym,.-sym

lib/libc/musl/crt/mips/crtn.s+4-2

...	...	@@ -3,11 +3,13 @@
3	3	.section .init
4	4	lw $gp,24($sp)
5	5	lw $ra,28($sp)
6		j $ra
	6	# zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315
	7	jr $ra
7	8	addu $sp,$sp,32
8	9
9	10	.section .fini
10	11	lw $gp,24($sp)
11	12	lw $ra,28($sp)
12		j $ra
	13	# zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315
	14	jr $ra
13	15	addu $sp,$sp,32

lib/libc/musl/crt/mips64/crtn.s+4-2

...	...	@@ -3,11 +3,13 @@
3	3	.section .init
4	4	ld $gp,16($sp)
5	5	ld $ra,24($sp)
6		j $ra
	6	# zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315
	7	jr $ra
7	8	daddu $sp,$sp,32
8	9
9	10	.section .fini
10	11	ld $gp,16($sp)
11	12	ld $ra,24($sp)
12		j $ra
	13	# zig patch: j <reg> -> jr <reg> for https://github.com/ziglang/zig/issues/21315
	14	jr $ra
13	15	daddu $sp,$sp,32