77 lines
3.5 KiB
Diff
77 lines
3.5 KiB
Diff
|
Author: Stefan Dirsch <sndirsch@suse.de>
|
||
|
|
Subject: Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag
|
||
|
|
References: bnc#765294, fdo#26663
|
||
|
|
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86-64_asm.py mesa-8.0.3/src/mapi/glapi/gen/gl_x86-64_asm.py
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86-64_asm.py 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/glapi/gen/gl_x86-64_asm.py 2012-06-12 12:09:17.000000000 +0200
|
||
|
|
@@ -181,7 +181,7 @@ class PrintGenericStubs(gl_XML.gl_print_
|
||
|
|
|
||
|
|
def printRealFooter(self):
|
||
|
|
print ''
|
||
|
|
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
|
||
|
|
+ print '#if 0 && defined(__linux__)'
|
||
|
|
print ' .section ".note.ABI-tag", "a"'
|
||
|
|
print ' .p2align 2'
|
||
|
|
print ' .long 1f - 0f /* name length */'
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86_asm.py mesa-8.0.3/src/mapi/glapi/gen/gl_x86_asm.py
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/gen/gl_x86_asm.py 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/glapi/gen/gl_x86_asm.py 2012-06-12 12:09:29.000000000 +0200
|
||
|
|
@@ -189,7 +189,7 @@ class PrintGenericStubs(gl_XML.gl_print_
|
||
|
|
print '\t\tALIGNTEXT16'
|
||
|
|
print 'GLNAME(gl_dispatch_functions_end):'
|
||
|
|
print ''
|
||
|
|
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
|
||
|
|
+ print '#if 0 && defined(__linux__)'
|
||
|
|
print ' .section ".note.ABI-tag", "a"'
|
||
|
|
print ' .p2align 2'
|
||
|
|
print ' .long 1f - 0f /* name length */'
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/glapi_x86-64.S mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:09:43.000000000 +0200
|
||
|
|
@@ -37448,7 +37448,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
|
||
|
|
.globl GL_PREFIX(TransformFeedbackVaryings) ; .set GL_PREFIX(TransformFeedbackVaryings), GL_PREFIX(TransformFeedbackVaryingsEXT)
|
||
|
|
.globl GL_PREFIX(ProvokingVertex) ; .set GL_PREFIX(ProvokingVertex), GL_PREFIX(ProvokingVertexEXT)
|
||
|
|
|
||
|
|
-#if defined(GLX_USE_TLS) && defined(__linux__)
|
||
|
|
+#if 0 && defined(__linux__)
|
||
|
|
.section ".note.ABI-tag", "a"
|
||
|
|
.p2align 2
|
||
|
|
.long 1f - 0f /* name length */
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S mesa-8.0.3/src/mapi/glapi/glapi_x86.S
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/glapi/glapi_x86.S 2012-06-12 12:09:01.000000000 +0200
|
||
|
|
@@ -1504,7 +1504,7 @@ GLNAME(gl_dispatch_functions_start):
|
||
|
|
ALIGNTEXT16
|
||
|
|
GLNAME(gl_dispatch_functions_end):
|
||
|
|
|
||
|
|
-#if defined(GLX_USE_TLS) && defined(__linux__)
|
||
|
|
+#if 0 && defined(__linux__)
|
||
|
|
.section ".note.ABI-tag", "a"
|
||
|
|
.p2align 2
|
||
|
|
.long 1f - 0f /* name length */
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:10:20.000000000 +0200
|
||
|
|
@@ -28,7 +28,7 @@
|
||
|
|
|
||
|
|
#include "u_macros.h"
|
||
|
|
|
||
|
|
-#ifdef __linux__
|
||
|
|
+#if 0
|
||
|
|
__asm__(".section .note.ABI-tag, \"a\"\n\t"
|
||
|
|
".p2align 2\n\t"
|
||
|
|
".long 1f - 0f\n\t" /* name length */
|
||
|
|
diff -u -r -p mesa-8.0.3.orig//src/mapi/mapi/entry_x86_tls.h mesa-8.0.3/src/mapi/mapi/entry_x86_tls.h
|
||
|
|
--- mesa-8.0.3.orig//src/mapi/mapi/entry_x86_tls.h 2012-06-12 12:07:39.000000000 +0200
|
||
|
|
+++ mesa-8.0.3/src/mapi/mapi/entry_x86_tls.h 2012-06-12 12:10:32.000000000 +0200
|
||
|
|
@@ -29,7 +29,7 @@
|
||
|
|
#include <string.h>
|
||
|
|
#include "u_macros.h"
|
||
|
|
|
||
|
|
-#ifdef __linux__
|
||
|
|
+#if 0
|
||
|
|
__asm__(".section .note.ABI-tag, \"a\"\n\t"
|
||
|
|
".p2align 2\n\t"
|
||
|
|
".long 1f - 0f\n\t" /* name length */
|