diff options
| author | Sverker Eriksson <[email protected]> | 2012-06-15 18:06:14 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-06-25 18:24:47 +0200 |
| commit | 4aa6543d18fa18677082d5f67e7b969d4e354ddb (patch) | |
| tree | 3c803545f056d11535068efd288dffa3605f4047 /erts | |
| parent | 093ddb2c954f2691cf5ca112a1ea6770c78a461b (diff) | |
| download | otp-4aa6543d18fa18677082d5f67e7b969d4e354ddb.tar.gz otp-4aa6543d18fa18677082d5f67e7b969d4e354ddb.tar.bz2 otp-4aa6543d18fa18677082d5f67e7b969d4e354ddb.zip | |
Fix compile error of HIPE enabled DEBUG emulator for ARM
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/hipe/hipe_arm_bifs.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_arm_bifs.m4 b/erts/emulator/hipe/hipe_arm_bifs.m4 index 1453f32f85..17c013f1fb 100644 --- a/erts/emulator/hipe/hipe_arm_bifs.m4 +++ b/erts/emulator/hipe/hipe_arm_bifs.m4 @@ -27,7 +27,7 @@ include(`hipe/hipe_arm_asm.m4') .p2align 2 `#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP) -# define CALL_BIF(F) mov r14, #F; str r14, [r0, #P_BIF_CALLEE]; bl hipe_debug_bif_wrapper +# define CALL_BIF(F) ldr r14, =F; str r14, [r0, #P_BIF_CALLEE]; bl hipe_debug_bif_wrapper #else # define CALL_BIF(F) bl F #endif' @@ -67,6 +67,7 @@ $1: RESTORE_CONTEXT_BIF beq nbif_1_simple_exception NBIF_RET(1) + .ltorg /* needed by LDR in debug version of `CALL_BIF' */ .size $1, .-$1 .type $1, %function #endif') @@ -95,6 +96,7 @@ $1: RESTORE_CONTEXT_BIF beq nbif_2_simple_exception NBIF_RET(2) + .ltorg .size $1, .-$1 .type $1, %function #endif') @@ -125,6 +127,7 @@ $1: RESTORE_CONTEXT_BIF beq nbif_3_simple_exception NBIF_RET(3) + .ltorg .size $1, .-$1 .type $1, %function #endif') @@ -149,6 +152,7 @@ $1: RESTORE_CONTEXT_BIF beq nbif_0_simple_exception NBIF_RET(0) + .ltorg .size $1, .-$1 .type $1, %function #endif') |