Attempt to fix the build on i386

PR:		19778


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1531 058c260c-8361-11dd-a0ac-aa2bafec7d09

7 files changed, 79 insertions, 5 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index d677f69..00aa4cc 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -32,14 +32,10 @@ PKGHELP=	${.CURDIR}/pkg-help
 # gcc from base can't handle some code in mesa 9.1+
 # We only care for 9.x and 8.x, not for old pre-clang default current.
 # This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
-. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) \
-		&& ${ARCH} == amd64
+. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000)
 CC=clang
 CXX=clang++
 CPP=clang-cpp
-# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
-. elif ${OSVERSION} < 901500 || ${ARCH} == i386
-USE_GCC=yes
 . endif
 
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h
new file mode 100644
index 0000000..13c245e
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h
@@ -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)
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h
new file mode 100644
index 0000000..d8a8e24
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h
@@ -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)
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h
new file mode 100644
index 0000000..b97cf4c
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h
@@ -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)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
new file mode 100644
index 0000000..32d4b05
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/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)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
new file mode 100644
index 0000000..51f2839
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/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)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
new file mode 100644
index 0000000..0aceed5
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/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)