Attachment #145174 for bug #192286

Lines 57-66 Link Here

(-)graphics/libGL/bsd.mesalib.mk (-4 lines)
57	src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \	57	src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \
58	src/mapi/mapi/mapi_abi.py	58	src/mapi/mapi/mapi_abi.py
59		59
60	# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
61	. if ${ARCH} == i386
62	USE_GCC=yes
63	. endif
64	.else	60	.else
65	CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu	61	CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu
66		62




--- src/mapi/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/mapi/entry_x86-64_tls.h	2014-07-29 20:28:05.000000000 +0200
@@ -63,8 +63,8 @@ entry_patch_public(void)
 {
 }
 
-static char
-x86_64_entry_start[];
+extern char
+x86_64_entry_start[] __attribute__((visibility("hidden")));
 
 mapi_func
 entry_get_public(int slot)




--- src/mapi/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/mapi/entry_x86_tls.h	2014-07-29 20:28:05.000000000 +0200
@@ -73,8 +73,8 @@ __asm__(".text");
 extern unsigned long
 x86_current_tls();
 
-static char x86_entry_start[];
-static char x86_entry_end[];
+extern char x86_entry_start[] __attribute__((visibility("hidden")));
+extern char x86_entry_end[] __attribute__((visibility("hidden")));
 
 void
 entry_patch_public(void)




--- src/mapi/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/mapi/entry_x86_tsd.h	2014-07-29 20:28:05.000000000 +0200
@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
 #include <string.h>
 #include "u_execmem.h"
 
-static const char x86_entry_start[];
-static const char x86_entry_end[];
+extern const char x86_entry_start[] __attribute__((visibility("hidden")));
+extern const char x86_entry_end[] __attribute__((visibility("hidden")));
 
 void
 entry_patch_public(void)

Return to bug 192286

Line 0 Link Here

(-)graphics/libGL/files/patch-src_mapi_mapi_entry_x86-64_tls.h (+13 lines)
	1	--- src/mapi/mapi/entry_x86-64_tls.h.orig 2013-10-05 05:59:22.000000000 +0200
	2	+++ src/mapi/mapi/entry_x86-64_tls.h 2014-07-29 20:28:05.000000000 +0200
	3	@@ -63,8 +63,8 @@ entry_patch_public(void)
	4	{
	5	}
	6
	7	-static char
	8	-x86_64_entry_start[];
	9	+extern char
	10	+x86_64_entry_start[] __attribute__((visibility("hidden")));
	11
	12	mapi_func
	13	entry_get_public(int slot)

Line 0 Link Here

(-)graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tls.h (+13 lines)
	1	--- src/mapi/mapi/entry_x86_tls.h.orig 2013-10-05 05:59:22.000000000 +0200
	2	+++ src/mapi/mapi/entry_x86_tls.h 2014-07-29 20:28:05.000000000 +0200
	3	@@ -73,8 +73,8 @@ __asm__(".text");
	4	extern unsigned long
	5	x86_current_tls();
	6
	7	-static char x86_entry_start[];
	8	-static char x86_entry_end[];
	9	+extern char x86_entry_start[] __attribute__((visibility("hidden")));
	10	+extern char x86_entry_end[] __attribute__((visibility("hidden")));
	11
	12	void
	13	entry_patch_public(void)

Line 0 Link Here

(-)graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tsd.h (+13 lines)
	1	--- src/mapi/mapi/entry_x86_tsd.h.orig 2013-10-05 05:59:22.000000000 +0200
	2	+++ src/mapi/mapi/entry_x86_tsd.h 2014-07-29 20:28:05.000000000 +0200
	3	@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
	4	#include <string.h>
	5	#include "u_execmem.h"
	6
	7	-static const char x86_entry_start[];
	8	-static const char x86_entry_end[];
	9	+extern const char x86_entry_start[] __attribute__((visibility("hidden")));
	10	+extern const char x86_entry_end[] __attribute__((visibility("hidden")));
	11
	12	void
	13	entry_patch_public(void)