aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-08-05 21:26:04 +0000
committerMax Horn2008-08-05 21:26:04 +0000
commit169b27de0a6ed5c5e80d9b0c63b8c4292c9f1742 (patch)
tree82c5a86638912fc16000c1cc1f32844f5ca71577
parentdf1246bf9fa04f0f72330d8dcea8c003c65f814d (diff)
downloadscummvm-rg350-169b27de0a6ed5c5e80d9b0c63b8c4292c9f1742.tar.gz
scummvm-rg350-169b27de0a6ed5c5e80d9b0c63b8c4292c9f1742.tar.bz2
scummvm-rg350-169b27de0a6ed5c5e80d9b0c63b8c4292c9f1742.zip
Patch #2014663: Do not mark stack as executable in HQx scaler
svn-id: r33645
-rw-r--r--graphics/scaler/hq2x_i386.asm5
-rw-r--r--graphics/scaler/hq3x_i386.asm5
2 files changed, 10 insertions, 0 deletions
diff --git a/graphics/scaler/hq2x_i386.asm b/graphics/scaler/hq2x_i386.asm
index ed194441ed..f176c340c1 100644
--- a/graphics/scaler/hq2x_i386.asm
+++ b/graphics/scaler/hq2x_i386.asm
@@ -1840,3 +1840,8 @@ FuncTable2:
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff --git a/graphics/scaler/hq3x_i386.asm b/graphics/scaler/hq3x_i386.asm
index e713fdd51a..8ffb2d5aba 100644
--- a/graphics/scaler/hq3x_i386.asm
+++ b/graphics/scaler/hq3x_i386.asm
@@ -2432,3 +2432,8 @@ FuncTable2:
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+