authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-08-08 19:08:33+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-08-09 16:56:23+02:00
log82b9ba071f33f7404db5d987232493dd122e991a
tree5cee608875b1f2e70e9638d1486ad7cedd0f04ea
parent19a0cef7e8adfff9dea6f9672cc022ad267939ef
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

std.pie: fix alpha, csky, and microblaze assembly

In hindsight, this approach was obviously not going to work since it's loading the unrelocated address of _DYNAMIC. Instead just use a PC-relative approach like other targets.

1 files changed, 27 insertions(+), 10 deletions(-)

lib/std/pie.zig+27-10
......@@ -83,7 +83,7 @@ inline fn getDynamicSymbol() [*]const elf.Dyn {
8383 \\ add %[ret], pc
8484 \\ b 2f
8585 \\1:
86 \\ .word _DYNAMIC-1b
86 \\ .word _DYNAMIC - 1b
8787 \\2:
8888 : [ret] "=r" (-> [*]const elf.Dyn),
8989 ),
......@@ -97,20 +97,29 @@ inline fn getDynamicSymbol() [*]const elf.Dyn {
9797 ),
9898 // The compiler is not required to load the GP register, so do it ourselves.
9999 .alpha => asm volatile (
100 \\ .weak _DYNAMIC
101 \\ .hidden _DYNAMIC
100102 \\ br $29, 1f
101103 \\1:
102104 \\ ldgp $29, 0($29)
103 \\ ldq %[ret], -0x8000($29)
105 \\ ldah %[ret], _DYNAMIC($29) !gprelhigh
106 \\ lda %[ret], _DYNAMIC(%[ret]) !gprellow
104107 : [ret] "=r" (-> [*]const elf.Dyn),
105108 :
106 : .{ .r26 = true, .r29 = true }),
107 // The CSKY ABI requires the gb register to point to the GOT. Additionally, the first
108 // entry in the GOT is defined to hold the address of _DYNAMIC.
109 : .{ .r29 = true }),
109110 .csky => asm volatile (
110 \\ mov %[ret], gb
111 \\ ldw %[ret], %[ret]
111 \\ .weak _DYNAMIC
112 \\ .hidden _DYNAMIC
113 \\ grs %[ret], 1f
114 \\ br 2f
115 \\1:
116 \\ .long _DYNAMIC - 1b
117 \\2:
118 \\ ldw r12, (%[ret], 0)
119 \\ addu %[ret], %[ret], r12
112120 : [ret] "=r" (-> [*]const elf.Dyn),
113 ),
121 :
122 : .{ .r12 = true }),
114123 .hexagon => asm volatile (
115124 \\ .weak _DYNAMIC
116125 \\ .hidden _DYNAMIC
......@@ -146,9 +155,17 @@ inline fn getDynamicSymbol() [*]const elf.Dyn {
146155 : [ret] "=r" (-> [*]const elf.Dyn),
147156 ),
148157 .microblaze, .microblazeel => asm volatile (
149 \\ lwi %[ret], r20, 0
158 \\ .weak _DYNAMIC
159 \\ .hidden _DYNAMIC
160 \\ mfs %[ret], rpc
161 \\ bri 1f
162 \\ .word _DYNAMIC - . + 8
163 \\1:
164 \\ lwi r18, %[ret], 8
165 \\ add %[ret], %[ret], r18
150166 : [ret] "=r" (-> [*]const elf.Dyn),
151 ),
167 :
168 : .{ .r18 = true }),
152169 .mips, .mipsel => asm volatile (
153170 \\ .weak _DYNAMIC
154171 \\ .hidden _DYNAMIC