diff -Naur otp_src_R12B-5.orig/erts/emulator/hipe/hipe_amd64_bifs.m4 otp_src_R12B-5/erts/emulator/hipe/hipe_amd64_bifs.m4
--- otp_src_R12B-5.orig/erts/emulator/hipe/hipe_amd64_bifs.m4	2009-01-11 23:17:03.000000000 +0100
+++ otp_src_R12B-5/erts/emulator/hipe/hipe_amd64_bifs.m4	2009-01-11 23:19:09.000000000 +0100
@@ -531,3 +531,7 @@
 define(gc_nofail_primop_interface_1,`nofail_primop_interface_1($1, $2)')
 
 include(`hipe/hipe_bif_list.m4')
+
+`#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif'
diff -Naur otp_src_R12B-5.orig/erts/emulator/hipe/hipe_amd64_glue.S otp_src_R12B-5/erts/emulator/hipe/hipe_amd64_glue.S
--- otp_src_R12B-5.orig/erts/emulator/hipe/hipe_amd64_glue.S	2009-01-11 23:17:03.000000000 +0100
+++ otp_src_R12B-5/erts/emulator/hipe/hipe_amd64_glue.S	2009-01-11 23:18:38.000000000 +0100
@@ -418,3 +418,7 @@
 	LOAD_ARG_REGS
 	SWITCH_C_TO_ERLANG_QUICK
 	NSP_RET0
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif