diff options
author | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
commit | d30cee99c662bf030ce035e56e342d7ebf155513 (patch) | |
tree | 7ab4b2cfbca419cd6bcc09fdee243b24deb7e6af /erts/emulator/hipe/hipe_amd64_bifs.m4 | |
parent | 24797b6ba55cfd83438381234c3108540ea29acb (diff) | |
parent | 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (diff) | |
download | otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.gz otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.bz2 otp-d30cee99c662bf030ce035e56e342d7ebf155513.zip |
Merge remote branch 'upstream/maint'
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_bifs.m4')
-rw-r--r-- | erts/emulator/hipe/hipe_amd64_bifs.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_bifs.m4 b/erts/emulator/hipe/hipe_amd64_bifs.m4 index ec25c0b9b7..42e8b2a9b0 100644 --- a/erts/emulator/hipe/hipe_amd64_bifs.m4 +++ b/erts/emulator/hipe/hipe_amd64_bifs.m4 @@ -30,12 +30,12 @@ include(`hipe/hipe_amd64_asm.m4') #define TEST_GOT_EXN cmpq $THE_NON_VALUE, %rax #endif' -define(TEST_GOT_MBUF,`movq P_MBUF(P), %rdx # `TEST_GOT_MBUF' +define(TEST_GOT_MBUF,`movq P_MBUF(P), %rdx /* `TEST_GOT_MBUF' */ testq %rdx, %rdx jnz 3f 2:') define(HANDLE_GOT_MBUF,` -3: call nbif_$1_gc_after_bif # `HANDLE_GOT_MBUF' +3: call nbif_$1_gc_after_bif /* `HANDLE_GOT_MBUF' */ jmp 2b') `#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP) |