diff options
| author | Sverker Eriksson <[email protected]> | 2016-12-09 19:23:06 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-12-09 19:23:06 +0100 |
| commit | a373987957c183f93416bd7b2c81e319377025f4 (patch) | |
| tree | f4b43db2778fb18df8114177e7e38cdffc418815 /erts | |
| parent | b29787dbcc53b4ab1b5bfedd1ad45708d0f99dc1 (diff) | |
| parent | f2956b24845a14475d90959bf8f8f90807c49a8d (diff) | |
| download | otp-a373987957c183f93416bd7b2c81e319377025f4.tar.gz otp-a373987957c183f93416bd7b2c81e319377025f4.tar.bz2 otp-a373987957c183f93416bd7b2c81e319377025f4.zip | |
Merge margnus1/hipe-arm-trampoline/PR-1272/OTP-14088
erts: Fix missing HiPE trampolines on arm (master only)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index 57fbbd9403..5c29473443 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -1121,7 +1121,7 @@ static struct hipe_mfa_info* mod2mfa_put(struct hipe_mfa_info* mfa) struct hipe_ref { struct hipe_ref_head head; /* list of refs to same calleee */ void *address; -#if defined(arm) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) +#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) void *trampoline; #endif unsigned int flags; @@ -1549,7 +1549,7 @@ BIF_RETTYPE hipe_bifs_add_ref_2(BIF_ALIST_2) ref = erts_alloc(ERTS_ALC_T_HIPE, sizeof(struct hipe_ref)); ref->address = address; -#if defined(arm) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) +#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) ref->trampoline = trampoline; #endif ref->flags = flags; @@ -1864,7 +1864,7 @@ void hipe_redirect_to_module(Module* modp) if (ref->flags & REF_FLAG_IS_LOAD_MFA) res = hipe_patch_insn(ref->address, (Uint)p->remote_address, am_load_mfa); else { -#if defined(arm) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) +#if defined(__arm__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) void* trampoline = ref->trampoline; #else void* trampoline = NULL; |