fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

linux: Don't emit a .note.ABI-tag section anymore (#26663)

Browse source 
We don't support pre-2.6 kernels anyway - the install docs say 2.6.28
for DRI - and apparently this confuses ld.so's sorting when multiple
libGLs are installed.  Just remove it.

Note: this is a candidate for the stable branches.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2013-04-23 14:07:33 -04:00
parent 73de07cbbc
commit 904b03824b
4 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mapi/entry_x86-64_tls.h
View file

@ -28,19 +28,6 @@
#include "u_macros.h"
#ifdef __linux__
__asm__(".section .note.ABI-tag, \"a\"\n\t"
".p2align 2\n\t"
".long 1f - 0f\n\t" /* name length */
".long 3f - 2f\n\t" /* data length */
".long 1\n\t" /* note length */
"0: .asciz \"GNU\"\n\t" /* vendor name */
"1: .p2align 2\n\t"
"2: .long 0\n\t" /* note data: the ABI tag */
".long 2,4,20\n\t" /* Minimum kernel version w/TLS */
"3: .p2align 2\n\t"); /* pad out section */
#endif /* __linux__ */
__asm__(".text\n"
".balign 32\n"
"x86_64_entry_start:");

13
src/mapi/entry_x86_tls.h
View file

@ -29,19 +29,6 @@
#include <string.h>
#include "u_macros.h"
#ifdef __linux__
__asm__(".section .note.ABI-tag, \"a\"\n\t"
".p2align 2\n\t"
".long 1f - 0f\n\t" /* name length */
".long 3f - 2f\n\t" /* data length */
".long 1\n\t" /* note length */
"0: .asciz \"GNU\"\n\t" /* vendor name */
"1: .p2align 2\n\t"
"2: .long 0\n\t" /* note data: the ABI tag */
".long 2,4,20\n\t" /* Minimum kernel version w/TLS */
"3: .p2align 2\n\t"); /* pad out section */
#endif /* __linux__ */
__asm__(".text");
__asm__("x86_current_tls:\n\t"

13
src/mapi/glapi/gen/gl_x86-64_asm.py
View file

@ -180,19 +180,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
def printRealFooter(self):
print ''
print '#if defined(GLX_USE_TLS) && defined(__linux__)'
print ' .section ".note.ABI-tag", "a"'
print ' .p2align 2'
print ' .long 1f - 0f /* name length */'
print ' .long 3f - 2f /* data length */'
print ' .long 1 /* note length */'
print '0: .asciz "GNU" /* vendor name */'
print '1: .p2align 2'
print '2: .long 0 /* note data: the ABI tag */'
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'

13
src/mapi/glapi/gen/gl_x86_asm.py
View file

@ -189,19 +189,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '\t\tALIGNTEXT16'
print 'GLNAME(gl_dispatch_functions_end):'
print ''
print '#if defined(GLX_USE_TLS) && defined(__linux__)'
print ' .section ".note.ABI-tag", "a"'
print ' .p2align 2'
print ' .long 1f - 0f /* name length */'
print ' .long 3f - 2f /* data length */'
print ' .long 1 /* note length */'
print '0: .asciz "GNU" /* vendor name */'
print '1: .p2align 2'
print '2: .long 0 /* note data: the ABI tag */'
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'