Skip to content

Commit 6f577fc

Browse files
staticfloatKristofferC
authored andcommitted
Fix armv7l trampoline (#40176)
We copy-pasted the wrong macro here, should have used `CNAMEADDR()` not `CNAME()`. This causes segfaults on armv7l processors by trying to read from an incorrect address when loading the trampoline target address value. (cherry picked from commit 1897e08)
1 parent ad9eac9 commit 6f577fc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cli/trampolines/trampolines_arm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.global CNAME(name); \
66
.cfi_startproc; \
77
CNAME(name)##:; \
8-
ldr ip, CONCAT(.L,CNAME(name)); \
8+
ldr ip, CONCAT(.L,CNAMEADDR(name)); \
99
CONCAT(.L,CNAME(name)): ;\
1010
add ip, pc, ip; \
1111
ldr pc, [ip]; \

0 commit comments

Comments
 (0)