summaryrefslogtreecommitdiff
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2006-04-17 18:58:24 +0000
committerKristian Høgsberg <krh@redhat.com>2006-04-17 18:58:24 +0000
commitfcdc6a7d2488defd66bc7e8398c6d8c9a6190a1a (patch)
tree1a813ec767acb758cb9f0913850975c2bcbe0fe1 /src/mesa/glapi
parent28bc3cdfbac8b8dda827e1bf03c44d14056a557f (diff)
Add .note.GNU-stack section to assembler files to avoid the default behavior
of requesting executable stacks.
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/gl_x86-64_asm.py4
-rw-r--r--src/mesa/glapi/gl_x86_asm.py4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 20050ef3cf..ea13d2ac52 100644
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -190,6 +190,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print ' .long 2,4,20 /* Minimum kernel version w/TLS */'
print '3: .p2align 2 /* pad out section */'
print '#endif /* GLX_USE_TLS */'
+ print ''
+ print '#if defined (__ELF__) && defined (__linux__)'
+ print ' .section .note.GNU-stack,"",%progbits'
+ print '#endif'
return
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index e62687a723..899cce64b9 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -188,6 +188,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print ' .long 2,4,20 /* Minimum kernel version w/TLS */'
print '3: .p2align 2 /* pad out section */'
print '#endif /* GLX_USE_TLS */'
+ print ''
+ print '#if defined (__ELF__) && defined (__linux__)'
+ print ' .section .note.GNU-stack,"",%progbits'
+ print '#endif'
return