Merge remote branch 'origin/opengl-es-v2'

[mesa.git] / src / mesa / x86 / common_x86_asm.S

diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index 654b3469d8a60634b2f9bed9645eb46af7190989..ea4047a0e140c31f9ab937479623057459731bb7 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -40,6 +40,7 @@
  */
 
 #include "matypes.h"
+#include "assyntax.h"
 #include "common_x86_features.h"
 
        SEG_TEXT
@@ -213,3 +214,7 @@ GLNAME( _mesa_test_os_sse_exception_support ):
 
 #endif
 
+       
+#if defined (__ELF__) && defined (__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif