Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/x86/x86_xform2.S b/src/mesa/x86/x86_xform2.S
index bb255b48550aee9883521edde5b1d0fc916c46cd..980725ef5184dd4c0047b941121bcebfce62df05 100644 (file)
--- a/src/mesa/x86/x86_xform2.S
+++ b/src/mesa/x86/x86_xform2.S
@@ -1,4 +1,3 @@
-/* $Id: x86_xform2.S,v 1.3 2005/01/04 14:33:47 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,6 +29,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
@@ -568,3 +568,7 @@ LLBL(x86_p2_ir_done):
        POP_L( ESI )
        RET
 #undef FRAME_OFFSET
+       
+#if defined (__ELF__) && defined (__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif