Skip to content

[compiler-rt][ARM] Only use bxaut when the target has pacbti #146057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
john-brawn-arm merged 1 commit into from
Jun 27, 2025
Merged

[compiler-rt][ARM] Only use bxaut when the target has pacbti #146057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_cdcmp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cdcmple)
msr APSR_nzcvq, ip
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop {r0-r3, r12, lr}
bxaut r12, lr, sp
PAC_RETURN
#else
pop {r0-r3}
POP_PC()
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_cfcmp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cfcmple)
msr APSR_nzcvq, ip
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop {r0-r3, r12, lr}
bxaut r12, lr, sp
PAC_RETURN
#else
pop {r0-r3}
POP_PC()
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_dcmp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# define PROLOGUE PACBTI_LANDING SEPARATOR \
push { r12, lr }
# define EPILOGUE pop { r12, lr } SEPARATOR \
bxaut r12, lr, sp
PAC_RETURN
#elif defined(__ARM_FEATURE_BTI_DEFAULT)
# define PROLOGUE PACBTI_LANDING SEPARATOR \
push { r4, lr }
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_fcmp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# define PROLOGUE PACBTI_LANDING SEPARATOR \
push { r12, lr }
# define EPILOGUE pop { r12, lr } SEPARATOR \
bxaut r12, lr, sp
PAC_RETURN
#elif defined(__ARM_FEATURE_BTI_DEFAULT)
# define PROLOGUE PACBTI_LANDING SEPARATOR \
push { r4, lr }
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_idivmod.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_idivmod)
add sp, sp, #4
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop { r12, lr }
bxaut r12, lr, sp
PAC_RETURN
#else
pop { pc }
#endif
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_ldivmod.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_ldivmod)
add sp, sp, #16
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop {r6, r12, lr}
bxaut r12, lr, sp
PAC_RETURN
#else
pop {r6, pc}
#endif
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_uidivmod.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ LOCAL_LABEL(case_denom_larger):
add sp, sp, #4
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop { r12, lr }
bxaut r12, lr, sp
PAC_RETURN
#else
pop { pc }
#endif
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/builtins/arm/aeabi_uldivmod.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_uldivmod)
add sp, sp, #16
#if defined(__ARM_FEATURE_PAC_DEFAULT)
pop {r6, r12, lr}
bxaut r12, lr, sp
PAC_RETURN
#else
pop {r6, pc}
#endif
Expand Down
6 changes: 6 additions & 0 deletions compiler-rt/lib/builtins/assembly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@
#define PACBTI_LANDING
#endif

#if defined(__ARM_FEATURE_PAUTH)
#define PAC_RETURN bxaut r12, lr, sp
#else
#define PAC_RETURN aut r12, lr, sp SEPARATOR bx lr
#endif

#else // !defined(__arm)
#define DECLARE_FUNC_ENCODING
#define DEFINE_CODE_STATE
Expand Down
Loading