Merge remote branch 'upstream/maint'

Conflicts:
	lib/ssl/src/ssl_connection.erl

6 files changed, 84 insertions, 20 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)
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4
index d9aa09b79e..ea4f68ef24 100644
--- a/erts/emulator/hipe/hipe_bif_list.m4
+++ b/erts/emulator/hipe/hipe_bif_list.m4
@@ -246,7 +246,7 @@ noproc_primop_interface_5(nbif_bs_put_big_integer, hipe_bs_put_big_integer)
 
 gc_bif_interface_0(nbif_check_get_msg, hipe_check_get_msg)
 
-#ifdef NO_FPE_SIGNALS
+#`ifdef' NO_FPE_SIGNALS
 nocons_nofail_primop_interface_0(nbif_emulate_fpe, hipe_emulate_fpe)
 #endif
 
diff --git a/erts/emulator/hipe/hipe_x86_bifs.m4 b/erts/emulator/hipe/hipe_x86_bifs.m4
index 3cb7d67be0..8cc6340933 100644
--- a/erts/emulator/hipe/hipe_x86_bifs.m4
+++ b/erts/emulator/hipe/hipe_x86_bifs.m4
@@ -35,12 +35,12 @@ include(`hipe/hipe_x86_asm.m4')
 #  define CALL_BIF(F)	call	CSYM(F)
 #endif'
 
-define(TEST_GOT_MBUF,`movl P_MBUF(P), %edx	# `TEST_GOT_MBUF'
+define(TEST_GOT_MBUF,`movl P_MBUF(P), %edx	/* `TEST_GOT_MBUF' */
 	testl %edx, %edx
 	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')
 
 /*
@@ -70,7 +70,7 @@ ASYM($1):
 	NBIF_ARG_REG(0,P)
 	NBIF_ARG(2,1,0)
 	lea 8(%esp), %eax
-	NBIF_ARG_REG(1,%eax)	# BIF__ARGS
+	NBIF_ARG_REG(1,%eax)	/* BIF__ARGS */
 	CALL_BIF($2)
 	TEST_GOT_MBUF
 
@@ -105,7 +105,7 @@ ASYM($1):
 	NBIF_ARG(2,2,0)
 	NBIF_ARG(3,2,1)
 	lea 8(%esp), %eax
-	NBIF_ARG_REG(1,%eax)	# BIF__ARGS
+	NBIF_ARG_REG(1,%eax)	/* BIF__ARGS */
 	CALL_BIF($2)
 	TEST_GOT_MBUF
 
@@ -141,7 +141,7 @@ ASYM($1):
 	NBIF_ARG(3,3,1)
 	NBIF_ARG(4,3,2)
 	lea 8(%esp), %eax
-	NBIF_ARG_REG(1,%eax)	# BIF__ARGS
+	NBIF_ARG_REG(1,%eax)	/* BIF__ARGS */
 	CALL_BIF($2)
 	TEST_GOT_MBUF
 
diff --git a/erts/emulator/valgrind/suppress.halfword b/erts/emulator/valgrind/suppress.halfword
new file mode 100644
index 0000000000..8fe448d897
--- /dev/null
+++ b/erts/emulator/valgrind/suppress.halfword
@@ -0,0 +1,56 @@
+# Extra suppressions specific for the halfword emulator.
+
+# --- Suppress all offheap binaries ---
+# Valgrinds leak check does not recognize pointers that are stored
+# at unaligned addresses. In halfword emulator we store 64-bit pointers
+# to offheap data on 32-bit aligned heaps.
+# We solve this by suppressing allocation of all offheap structures
+# that are not referenced by other tables (ie binaries).
+
+{
+Halfword erts_bin_nrml_alloc
+Memcheck:Leak
+...
+fun:erts_bin_nrml_alloc
+...
+}
+
+{
+Halfword erts_bin_realloc
+Memcheck:Leak
+...
+fun:erts_bin_realloc
+...
+}
+
+{
+Halfword erts_bin_realloc_fnf
+Memcheck:Leak
+...
+fun:erts_bin_realloc_fnf
+...
+}
+
+{
+Halfword erts_bin_drv_alloc
+Memcheck:Leak
+...
+fun:erts_bin_drv_alloc
+...
+}
+
+{
+Halfword erts_bin_drv_alloc_fnf
+Memcheck:Leak
+...
+fun:erts_bin_drv_alloc_fnf
+...
+}
+
+{
+Halfword erts_create_magic_binary
+Memcheck:Leak
+...
+fun:erts_create_magic_binary
+...
+}
diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0
index 62ba032520..b3507bdba7 100644
--- a/erts/emulator/valgrind/suppress.patched.3.6.0
+++ b/erts/emulator/valgrind/suppress.patched.3.6.0
@@ -133,26 +133,18 @@ fun:pthread_create@@GLIBC_2.2.5
 {
 zlib; ok according to zlib developers
 Memcheck:Cond
-fun:longest_match
+...
 fun:deflate_slow
 fun:deflate
 }
 {
 zlib; ok according to zlib developers
 Memcheck:Cond
-fun:longest_match
+...
 fun:deflate_fast
 fun:deflate
 }
 {
-zlib; ok accordnig to zlib (this one popped up with valgrind-3.6.0)
-Memcheck:Cond
-fun:deflate_slow
-fun:deflate
-fun:zlib_deflate
-fun:zlib_ctl
-}
-{
 No leak; pointer into block
 Memcheck:Leak
 fun:malloc
@@ -275,6 +267,14 @@ obj:*/ssleay.*
 }
 
 {
+   Harmless assembler bug in openssl
+   Memcheck:Addr8
+   ...
+   fun:AES_cbc_encrypt
+   ...
+}
+
+{
 erts_bits_init_state; Why is this needed?
 Memcheck:Leak
 PossiblyLost
diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard
index 5a129bfd10..beecf1a7b5 100644
--- a/erts/emulator/valgrind/suppress.standard
+++ b/erts/emulator/valgrind/suppress.standard
@@ -120,14 +120,14 @@ fun:pthread_create@@GLIBC_2.2.5
 {
 zlib; ok according to zlib developers
 Memcheck:Cond
-fun:longest_match
+...
 fun:deflate_slow
 fun:deflate
 }
 {
 zlib; ok according to zlib developers
 Memcheck:Cond
-fun:longest_match
+...
 fun:deflate_fast
 fun:deflate
 }
@@ -252,6 +252,14 @@ obj:*/ssleay.*
 }
 
 {
+   Harmless assembler bug in openssl
+   Memcheck:Addr8
+   ...
+   fun:AES_cbc_encrypt
+   ...
+}
+
+{
 Prebuilt constant terms in os_info_init (PossiblyLost)
 Memcheck:Leak
 fun:malloc