From 7877b0f6d2f2ddbe3bdd232177fd948860c1656a Mon Sep 17 00:00:00 2001 From: "kma@webrtc.org" Date: Wed, 12 Dec 2012 23:22:13 +0000 Subject: [PATCH] Added noexecstack markers for assembly files (webrtc issue 1172). Webrtc builds on ios, linux, android and other major platforms passed. Didn't do chrome build test. Review URL: https://webrtc-codereview.appspot.com/987004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3275 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/interface/asm_defines.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webrtc/system_wrappers/interface/asm_defines.h b/webrtc/system_wrappers/interface/asm_defines.h index 9ef6c8f3b7..c9f99b74f4 100644 --- a/webrtc/system_wrappers/interface/asm_defines.h +++ b/webrtc/system_wrappers/interface/asm_defines.h @@ -11,6 +11,10 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + // Define the macros used in ARM assembly code, so that for Mac or iOS builds // we add leading underscores for the function names. #ifdef __APPLE__ @@ -29,4 +33,6 @@ _\name: .endm #endif +.text + #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_COMPILE_ASSERT_H_