diff src/hermes/x86p_32.asm @ 1199:2d6dc7de1145

From: Mike Frysinger <vapier@gentoo.org> To: sdl@libsdl.org Date: Sun, 11 Dec 2005 22:57:37 -0500 Subject: [SDL] exec stack in libsdl update i posted back in September a patch to remove executable stacks: http://www.devolution.com/pipermail/sdl/2005-September/070626.html later in November, a similar patch was merged it seems: http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/hermes/mmx_main.asm however, this lacks the additional output format checks that i posted in my patch ... this isnt a problem if the hermes asm code is only ever used to produce ELF objects, but if this is not true, then the additional checks in my original patch will need to be merged -mike
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 12 Dec 2005 09:13:12 +0000
parents da33b7e6d181
children 393092a3ebf6
line wrap: on
line diff
--- a/src/hermes/x86p_32.asm	Thu Dec 08 14:48:21 2005 +0000
+++ b/src/hermes/x86p_32.asm	Mon Dec 12 09:13:12 2005 +0000
@@ -25,10 +25,8 @@
 
 EXTERN _x86return
 	
-SECTION .note.GNU-stack noalloc progbits noexec nowrite
 SECTION .text
 
-
 ;; _Convert_*
 ;; Paramters:	
 ;;   ESI = source 
@@ -1042,3 +1040,7 @@
 	
 .L4:	
 	jmp _x86return
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif