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

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>

diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h
index 72d4125a6948c523c4648501ed580f7ea39c0344..36cad00c208db7b87fde0c984f66352b0d896d6a 100644 (file)
--- a/src/mapi/entry_x86-64_tls.h
+++ b/src/mapi/entry_x86-64_tls.h
@@ -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:");

diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h
index de918128eee576711794e9bc3ce0e470b8ae4dd4..58d09caa6d11f86585402c87ba839b66bfa20b43 100644 (file)
--- a/src/mapi/entry_x86_tls.h
+++ b/src/mapi/entry_x86_tls.h
@@ -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"

diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index a3548c2951e0ba9a0025bb8f8dae8a7ff1c68d75..19e0e15b061fd5e1f5b2037be4840fc776afe634 100644 (file)
--- a/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -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'

diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index 8b0f6ee2409ff82b2436fe741fa64cf8b85ed103..919bbc0328266b73db7d1bbb663dbfc04befd8d1 100644 (file)
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -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'