aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-09-22 14:39:57 +0200
committerMarcus Arendt <[email protected]>2014-09-22 14:39:57 +0200
commit1409a50a677ed48f236307276b79329574d91ac9 (patch)
tree5168cc6c4c89831709d4ee0f6674c9ab4e6f74ae /erts/emulator
parent90ffc1634fc842568a525bf3db94d61a7c30a26c (diff)
parent44f2f04cb1b5f024ba6934e6cf350b1ffbcaa3ee (diff)
downloadotp-1409a50a677ed48f236307276b79329574d91ac9.tar.gz
otp-1409a50a677ed48f236307276b79329574d91ac9.tar.bz2
otp-1409a50a677ed48f236307276b79329574d91ac9.zip
Merge branch 'nox/fix-debug-hipe-lock-checking/OTP-12188' into maint
* nox/fix-debug-hipe-lock-checking/OTP-12188: Fix HiPE debug lock checking on OS X 64bit
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/hipe/hipe_amd64_bifs.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_bifs.m4 b/erts/emulator/hipe/hipe_amd64_bifs.m4
index 0de69a617f..a3219c7586 100644
--- a/erts/emulator/hipe/hipe_amd64_bifs.m4
+++ b/erts/emulator/hipe/hipe_amd64_bifs.m4
@@ -39,7 +39,10 @@ define(HANDLE_GOT_MBUF,`
jmp 2b')
`#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP)
-# define CALL_BIF(F) movq $CSYM(F), P_BIF_CALLEE(P); call CSYM(hipe_debug_bif_wrapper)
+# define CALL_BIF(F) \
+ movq CSYM(F)@GOTPCREL(%rip), %r11; \
+ movq %r11, P_BIF_CALLEE(P); \
+ call CSYM(hipe_debug_bif_wrapper)
#else
# define CALL_BIF(F) call CSYM(F)
#endif'