--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -180,7 +180,7 @@
 
 	def printRealFooter(self):
 		print ''
-		print '#if defined(GLX_USE_TLS) && defined(__linux__)'
+		print '#if 0 && defined(GLX_USE_TLS) && defined(__linux__)'
 		print '	.section ".note.ABI-tag", "a"'
 		print '	.p2align 2'
 		print '	.long	1f - 0f   /* name length */'
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -190,7 +190,7 @@
 		print '\t\tALIGNTEXT16'
 		print 'GLNAME(gl_dispatch_functions_end):'
 		print ''
-		print '#if defined(GLX_USE_TLS) && defined(__linux__)'
+		print '#if 0 && defined(GLX_USE_TLS) && defined(__linux__)'
 		print '	.section ".note.ABI-tag", "a"'
 		print '	.p2align 2'
 		print '	.long	1f - 0f   /* name length */'
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -30396,7 +30396,7 @@
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 	.globl GL_PREFIX(ProvokingVertex) ; .set GL_PREFIX(ProvokingVertex), GL_PREFIX(ProvokingVertexEXT)
 
-#if defined(GLX_USE_TLS) && defined(__linux__)
+#if 0 && defined(GLX_USE_TLS) && defined(__linux__)
 	.section ".note.ABI-tag", "a"
 	.p2align 2
 	.long	1f - 0f   /* name length */
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -1324,7 +1324,7 @@
 		ALIGNTEXT16
 GLNAME(gl_dispatch_functions_end):
 
-#if defined(GLX_USE_TLS) && defined(__linux__)
+#if 0 && defined(GLX_USE_TLS) && defined(__linux__)
 	.section ".note.ABI-tag", "a"
 	.p2align 2
 	.long	1f - 0f   /* name length */