From 308eb0c3443480453613c30cacfa21a9a690d975 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 13 Dec 2012 18:44:41 +0000 Subject: [PATCH] Do not allows the other elfs to run on the chimney stack BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/990004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@519 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_x86.asm | 10 ---------- source/x86inc.asm | 6 ++++++ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README.chromium b/README.chromium index 591aa242a..0e0080764 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 516 +Version: 519 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 283037310..0c617e760 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 516 +#define LIBYUV_VERSION 519 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_x86.asm b/source/row_x86.asm index 6100e9b5d..11650c040 100644 --- a/source/row_x86.asm +++ b/source/row_x86.asm @@ -15,16 +15,6 @@ %endif %include "x86inc.asm" -%ifidn __OUTPUT_FORMAT__,elf -section .note.GNU-stack noalloc noexec nowrite progbits -%endif -%ifidn __OUTPUT_FORMAT__,elf32 -section .note.GNU-stack noalloc noexec nowrite progbits -%endif -%ifidn __OUTPUT_FORMAT__,elf64 -section .note.GNU-stack noalloc noexec nowrite progbits -%endif - SECTION .text ; cglobal numeric constants are parameters, gpr regs, mm regs diff --git a/source/x86inc.asm b/source/x86inc.asm index f3e39d522..cb5c32df3 100644 --- a/source/x86inc.asm +++ b/source/x86inc.asm @@ -550,6 +550,12 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 %ifidn __OUTPUT_FORMAT__,elf SECTION .note.GNU-stack noalloc noexec nowrite progbits %endif +%ifidn __OUTPUT_FORMAT__,elf32 +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%ifidn __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits +%endif ; cpuflags