Index: graphics/libGL/bsd.mesalib.mk
===================================================================
--- graphics/libGL/bsd.mesalib.mk	(revision 362984)
+++ graphics/libGL/bsd.mesalib.mk	(working copy)
@@ -57,10 +57,6 @@
 		src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \
 		src/mapi/mapi/mapi_abi.py
 
-# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older. 
-. if ${ARCH} == i386
-USE_GCC=yes
-. endif
 .else
 CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu
 
Index: graphics/libGL/files/patch-src_mapi_mapi_entry_x86-64_tls.h
===================================================================
--- graphics/libGL/files/patch-src_mapi_mapi_entry_x86-64_tls.h	(revision 0)
+++ graphics/libGL/files/patch-src_mapi_mapi_entry_x86-64_tls.h	(working copy)
@@ -0,0 +1,13 @@
+--- 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)
Index: graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tls.h
===================================================================
--- graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tls.h	(revision 0)
+++ graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tls.h	(working copy)
@@ -0,0 +1,13 @@
+--- 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)
Index: graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tsd.h
===================================================================
--- graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tsd.h	(revision 0)
+++ graphics/libGL/files/patch-src_mapi_mapi_entry_x86_tsd.h	(working copy)
@@ -0,0 +1,13 @@
+--- 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)