diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-09-22 15:58:35 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-09-22 15:58:35 +0200 |
| commit | f5919f44bba5cd8451735086e75f6483e000b2a1 (patch) | |
| tree | 27e4cc6e380ed8926715b67b7d6fe8ce9272ea4e /erts | |
| parent | 937f447df79b7dfa6d7df7c8d208f23a192baffa (diff) | |
| parent | c02166a6fccac8b6108a99a6bd95ffad6ac6f709 (diff) | |
| download | otp-f5919f44bba5cd8451735086e75f6483e000b2a1.tar.gz otp-f5919f44bba5cd8451735086e75f6483e000b2a1.tar.bz2 otp-f5919f44bba5cd8451735086e75f6483e000b2a1.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_bifs.m4 | 5 |
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' |