You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
106 lines
2.4 KiB
106 lines
2.4 KiB
10 years ago
|
--- src/effect/2xsaimmx.asm
|
||
|
+++ src/effect/2xsaimmx.asm
|
||
|
@@ -2107,3 +2107,7 @@
|
||
|
final1b resb 8
|
||
|
final2a resb 8
|
||
|
final2b resb 8
|
||
|
+
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/effect/effect_i386.asm
|
||
|
+++ src/effect/effect_i386.asm
|
||
|
@@ -88,3 +88,7 @@
|
||
|
emms
|
||
|
|
||
|
endproc
|
||
|
+
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/effect/hq2x16.asm
|
||
|
+++ src/effect/hq2x16.asm
|
||
|
@@ -1935,3 +1935,7 @@
|
||
|
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
|
||
|
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
|
||
|
|
||
|
+
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/effect/hq3x16.asm
|
||
|
+++ src/effect/hq3x16.asm
|
||
|
@@ -2520,3 +2520,7 @@
|
||
|
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
|
||
|
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
|
||
|
|
||
|
+
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/memcpy.S
|
||
|
+++ src/memcpy.S
|
||
|
@@ -495,4 +495,8 @@
|
||
|
|
||
|
Lmemcpy_bsrcul1l4:
|
||
|
add r1, r1, #1
|
||
|
-b Lmemcpy_bl4
|
||
|
\ No newline at end of file
|
||
|
+b Lmemcpy_bl4
|
||
|
+
|
||
|
+#ifdef __ELF__
|
||
|
+.section .note.GNU-stack,"",@progbits
|
||
|
+#endif
|
||
|
--- src/raze/Makefile.am
|
||
|
+++ src/raze/Makefile.am
|
||
|
@@ -20,7 +20,7 @@
|
||
|
$(srcdir)/strip_ $< $@
|
||
|
|
||
|
raze2.asm: raze.asmu raze.incu raze.regu
|
||
|
- nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@
|
||
|
+ nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@
|
||
|
|
||
|
# This assembles the file, once it's been pre-processed
|
||
|
raze.o: raze2.asm
|
||
|
--- src/raze/raze.asm
|
||
|
+++ src/raze/raze.asm
|
||
|
@@ -4259,3 +4259,6 @@
|
||
|
|
||
|
;- the end ------------------------------------------------------------------;
|
||
|
|
||
|
+%ifidn ___OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/screen_i386.asm
|
||
|
+++ src/screen_i386.asm
|
||
|
@@ -96,3 +96,6 @@
|
||
|
endproc
|
||
|
|
||
|
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|
||
|
--- src/star/star.c
|
||
|
+++ src/star/star.c
|
||
|
@@ -2431,6 +2431,10 @@
|
||
|
*/
|
||
|
static void suffixes(void) {
|
||
|
emit("end\n");
|
||
|
+
|
||
|
+ emit("%%ifidn ___OUTPUT_FORMAT__,elf\n");
|
||
|
+ emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
|
||
|
+ emit("%%endif\n");
|
||
|
}
|
||
|
|
||
|
/****************************************************************************
|
||
|
--- src/video_i386.asm
|
||
|
+++ src/video_i386.asm
|
||
|
@@ -86,3 +86,7 @@
|
||
|
|
||
|
popa
|
||
|
endproc
|
||
|
+
|
||
|
+%ifidn __OUTPUT_FORMAT__,elf
|
||
|
+section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
+%endif
|