Index: src/forwarding/forwarding-amd64-elf.S
==================================================================
--- src/forwarding/forwarding-amd64-elf.S
+++ src/forwarding/forwarding-amd64-elf.S
@@ -218,8 +218,8 @@
 	.long 0
 	.quad 0
 module:
 	.quad 8, 32, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-arm-elf.S
==================================================================
--- src/forwarding/forwarding-arm-elf.S
+++ src/forwarding/forwarding-arm-elf.S
@@ -166,8 +166,8 @@
 	.long 0
 	.long 0
 module:
 	.long 8, 16, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-arm64-elf.S
==================================================================
--- src/forwarding/forwarding-arm64-elf.S
+++ src/forwarding/forwarding-arm64-elf.S
@@ -124,8 +124,8 @@
 	.long 4
 	.xword 0
 module:
 	.xword 8, 32, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-mips-elf.S
==================================================================
--- src/forwarding/forwarding-mips-elf.S
+++ src/forwarding/forwarding-mips-elf.S
@@ -322,8 +322,8 @@
 	.long 0
 	.long 0
 module:
 	.long 8, 16, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-powerpc-elf.S
==================================================================
--- src/forwarding/forwarding-powerpc-elf.S
+++ src/forwarding/forwarding-powerpc-elf.S
@@ -355,8 +355,8 @@
 	.long OFMethodNotFound
 .Lgot_OFMethodNotFound_stret:
 	.long OFMethodNotFound_stret
 #endif
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/forwarding/forwarding-sparc-elf.S
==================================================================
--- src/forwarding/forwarding-sparc-elf.S
+++ src/forwarding/forwarding-sparc-elf.S
@@ -188,8 +188,8 @@
 	.word 0
 	.word 0
 module:
 	.word 8, 16, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-sparc64-elf.S
==================================================================
--- src/forwarding/forwarding-sparc64-elf.S
+++ src/forwarding/forwarding-sparc64-elf.S
@@ -248,8 +248,8 @@
 	.word 0
 	.xword 0
 module:
 	.xword 8, 32, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/forwarding/forwarding-x86-elf.S
==================================================================
--- src/forwarding/forwarding-x86-elf.S
+++ src/forwarding/forwarding-x86-elf.S
@@ -193,8 +193,8 @@
 	.long 0
 	.long 0
 module:
 	.long 8, 16, 0, symtab
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-amd64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-amd64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-amd64-elf.S
@@ -91,8 +91,8 @@
 
 nilMethod:
 	xorq	%rax, %rax
 	ret
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-arm-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-arm-elf.S
+++ src/runtime/lookup-asm/lookup-asm-arm-elf.S
@@ -113,8 +113,8 @@
 
 nilMethod:
 	mov	r0, #0
 	bx	lr
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-arm64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-arm64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-arm64-elf.S
@@ -91,8 +91,8 @@
 
 nilMethod:
 	mov	x0, #0
 	ret
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-mips-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-mips-elf.S
+++ src/runtime/lookup-asm/lookup-asm-mips-elf.S
@@ -152,8 +152,8 @@
 
 nilMethod:
 	move	$v0, $zero
 	jr	$ra
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S
@@ -132,8 +132,8 @@
 
 nilMethod:
 	move	$v0, $zero
 	jr	$ra
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-powerpc-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-powerpc-elf.S
+++ src/runtime/lookup-asm/lookup-asm-powerpc-elf.S
@@ -166,8 +166,8 @@
 	.long objc_taggedPointerSecret
 .Lgot_objc_taggedPointerClasses:
 	.long objc_taggedPointerClasses
 #endif
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S
@@ -156,8 +156,8 @@
 	li	%r3, 0
 	blr
 .type nilMethod, @function
 .size nilMethod, .-.Lbegin_nilMethod
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-sparc-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-sparc-elf.S
+++ src/runtime/lookup-asm/lookup-asm-sparc-elf.S
@@ -142,8 +142,8 @@
 
 nilMethod:
 	retl
 	 clr	%o0
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
@@ -139,8 +139,8 @@
 
 nilMethod:
 	retl
 	 clr	%o0
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-x86-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-x86-elf.S
+++ src/runtime/lookup-asm/lookup-asm-x86-elf.S
@@ -108,8 +108,8 @@
 
 getEIP:
 	movl	(%esp), %eax
 	ret
 
-#if defined(OF_LINUX) || defined(OF_HURD)
+#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
 .section .note.GNU-stack, "", %progbits
 #endif