Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maint

* sverk/hipe-solaris-m4-bug/OTP-10577: erts: Change assembler comment for hipe on x86 and amd64 erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
IvanDubovik · Nov 13, 2012 · 574b023 · 574b023
2 parents 27e544f + a31e27e
commit 574b023
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -245,7 +245,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
@@ -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