29 lines
842 B
Diff
29 lines
842 B
Diff
|
Description: Fix executable stack on i386
|
||
|
|
Fix is needed only for nasm >= 2.09, not tested on older versions.
|
||
|
|
Author: Andrey Rahmatullin <wrar@wrar.name>
|
||
|
|
Bug: http://pcsxr.codeplex.com/workitem/7915
|
||
|
|
Last-Update: 2011-01-15
|
||
|
|
|
||
|
|
--- a/plugins/dfxvideo/Makefile.am
|
||
|
|
+++ b/plugins/dfxvideo/Makefile.am
|
||
|
|
@@ -4,7 +4,7 @@ SUFFIXES = .asm
|
||
|
|
|
||
|
|
.asm.lo:
|
||
|
|
$(LIBTOOL) --tag=CC --mode=compile \
|
||
|
|
- $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
|
||
|
|
+ $(STRIP_FPIC) $(NASM) -f elf32 -d ELF -I${srcdir}/ $<
|
||
|
|
|
||
|
|
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
|
||
|
|
-DDATADIR=\"${datadir}/psemu/\" \
|
||
|
|
--- a/plugins/dfxvideo/i386.asm
|
||
|
|
+++ b/plugins/dfxvideo/i386.asm
|
||
|
|
@@ -61,7 +61,7 @@ NEWSYM i386_shl10idiv
|
||
|
|
mov esp, ebp
|
||
|
|
pop ebp
|
||
|
|
ret
|
||
|
|
-%ifidn __OUTPUT_FORMAT__,elf
|
||
|
|
+%ifidn __OUTPUT_FORMAT__,elf32
|
||
|
|
section .note.GNU-stack noalloc noexec nowrite progbits
|
||
|
|
%endif
|
||
|
|
|