diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-04-23 14:07:33 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-04-25 15:51:35 -0400 |
| commit | 904b03824b4c5cc24649aa69dd1a557ddfd5dda3 (patch) | |
| tree | 2476aa5ef980bc4bebff32414aa71b87e423bdd6 /src/mapi/entry_x86_tls.h | |
| parent | 73de07cbbcaf6804c489546cce1b3c55db4535ae (diff) | |
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>
Diffstat (limited to 'src/mapi/entry_x86_tls.h')
| -rw-r--r-- | src/mapi/entry_x86_tls.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h index de918128eee..58d09caa6d1 100644 --- 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" |