diff options
author | Zoltan Varga <vargaz@gmail.com> | 2021-02-04 20:06:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-04 20:06:56 +0300 |
commit | 2180f2d54a969520b1136f67a4316129a168c210 (patch) | |
tree | 0e645c09fafb057778cec6fdcd7250fbfb08ccb7 | |
parent | 43190aeb5f7e4d7e0185d3b656054bf232219fe2 (diff) |
Fix the arm64 build. (#20820)
-rw-r--r-- | mono/mini/mini-arm64.c | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/mono/mini/mini-arm64.c b/mono/mini/mini-arm64.c index 3e5b8985d64..7592743e8bb 100644 --- a/mono/mini/mini-arm64.c +++ b/mono/mini/mini-arm64.c @@ -58,6 +58,7 @@ static gboolean ios_abi; static gboolean enable_ptrauth; static __attribute__ ((__warn_unused_result__)) guint8* emit_load_regset (guint8 *code, guint64 regs, int basereg, int offset); +static guint8* emit_brx (guint8 *code, int reg); static guint8* emit_blrx (guint8 *code, int reg); const char* @@ -5031,38 +5032,6 @@ emit_store_regset_cfa (MonoCompile *cfg, guint8 *code, guint64 regs, int basereg return code; } -static guint8* -emit_blrx (guint8 *code, int reg) -{ - if (enable_ptrauth) - arm_blraaz (code, reg); - else - arm_blrx (code, reg); - return code; -} - -guint8* -mono_arm_emit_blrx (guint8 *code, int reg) -{ - return emit_blrx (code, reg); -} - -static guint8* -emit_brx (guint8 *code, int reg) -{ - if (enable_ptrauth) - arm_braaz (code, reg); - else - arm_brx (code, reg); - return code; -} - -guint8* -mono_arm_emit_brx (guint8 *code, int reg) -{ - return emit_brx (code, reg); -} - /* * emit_setup_lmf: * @@ -5680,3 +5649,35 @@ mono_arch_load_function (MonoJitICallId jit_icall_id) } return target; } + +static guint8* +emit_blrx (guint8 *code, int reg) +{ + if (enable_ptrauth) + arm_blraaz (code, reg); + else + arm_blrx (code, reg); + return code; +} + +static guint8* +emit_brx (guint8 *code, int reg) +{ + if (enable_ptrauth) + arm_braaz (code, reg); + else + arm_brx (code, reg); + return code; +} + +guint8* +mono_arm_emit_blrx (guint8 *code, int reg) +{ + return emit_blrx (code, reg); +} + +guint8* +mono_arm_emit_brx (guint8 *code, int reg) +{ + return emit_brx (code, reg); +} |