summaryrefslogtreecommitdiffstats
path: root/src/mesa/x86-64
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2006-04-17 18:58:24 +0000
committerKristian Høgsberg <[email protected]>2006-04-17 18:58:24 +0000
commitfcdc6a7d2488defd66bc7e8398c6d8c9a6190a1a (patch)
tree1a813ec767acb758cb9f0913850975c2bcbe0fe1 /src/mesa/x86-64
parent28bc3cdfbac8b8dda827e1bf03c44d14056a557f (diff)
Add .note.GNU-stack section to assembler files to avoid the default behavior
of requesting executable stacks.
Diffstat (limited to 'src/mesa/x86-64')
-rw-r--r--src/mesa/x86-64/glapi_x86-64.S4
-rw-r--r--src/mesa/x86-64/xform4.S6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 34433510c56..d976d53fe4b 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -31127,3 +31127,7 @@ GL_PREFIX(BlitFramebufferEXT):
.long 2,4,20 /* Minimum kernel version w/TLS */
3: .p2align 2 /* pad out section */
#endif /* GLX_USE_TLS */
+
+#if defined (__ELF__) && defined (__linux__)
+ .section .note.GNU-stack,"",%progbits
+#endif
diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S
index 622c3f0c251..65328f6666e 100644
--- a/src/mesa/x86-64/xform4.S
+++ b/src/mesa/x86-64/xform4.S
@@ -1,4 +1,4 @@
-/* $Id: xform4.S,v 1.1 2005/05/07 16:59:59 brianp Exp $ */
+/* $Id: xform4.S,v 1.2 2006/04/17 18:58:24 krh Exp $ */
/*
* Mesa 3-D graphics library
@@ -456,3 +456,7 @@ p4_2d_done:
ret
#endif
+
+#if defined (__ELF__) && defined (__linux__)
+ .section .note.GNU-stack,"",%progbits
+#endif