Switch back to using LLVM on i386.

ok sthen@

x11/vlc/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.161 2013/01/02 10:14:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.162 2013/01/03 03:05:47 brad Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,9 +8,9 @@ COMMENT-jack=	JACK audio output module for VLC
 V=		2.0.5
 DISTNAME=	vlc-${V}
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	0
+REVISION-main=	1
 PKGNAME-jack=	vlc-jack-${V}
-REVISION-jack=	0
+REVISION-jack=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${V}/
 EXTRACT_SUFX=	.tar.xz
@@ -48,14 +48,10 @@ AUTOCONF_VERSION= 2.69
 AUTOMAKE_VERSION= 1.11
 
 MODULES=	devel/gettext \
-		gcc4 \
 		lang/clang \
 		x11/qt4
-MODCLANG_ARCHS=	amd64
+MODCLANG_ARCHS=	amd64 i386
 MODCLANG_LANGS=	c
-MODGCC4_VERSION= 4.6
-MODGCC4_ARCHS=	i386
-MODGCC4_LANGS=	c
 LIB_DEPENDS-main= ${MODQT4_LIB_DEPENDS} \
 		${MODGETTEXT_LIB_DEPENDS} \
 		archivers/libtar \

x11/vlc/patches/patch-include_vlc_common_h

@@ -0,0 +1,21 @@
+$OpenBSD: patch-include_vlc_common_h,v 1.3 2013/01/03 03:07:29 brad Exp $
+--- include/vlc_common.h.orig	Mon Dec 31 21:37:48 2012
++++ include/vlc_common.h	Mon Dec 31 21:39:40 2012
+@@ -659,7 +659,7 @@ static inline uint16_t bswap16 (uint16_t x)
+ VLC_USED
+ static inline uint32_t bswap32 (uint32_t x)
+ {
+-#if VLC_GCC_VERSION(4,3)
++#if VLC_GCC_VERSION(4,3) || defined(__clang__)
+     return __builtin_bswap32 (x);
+ #else
+     return ((x & 0x000000FF) << 24)
+@@ -673,7 +673,7 @@ static inline uint32_t bswap32 (uint32_t x)
+ VLC_USED
+ static inline uint64_t bswap64 (uint64_t x)
+ {
+-#if VLC_GCC_VERSION(4,3)
++#if VLC_GCC_VERSION(4,3) || defined(__clang__)
+     return __builtin_bswap64 (x);
+ #elif !defined (__cplusplus)
+     return ((x & 0x00000000000000FF) << 56)

x11/vlc/patches/patch-include_vlc_cpu_h

@@ -0,0 +1,21 @@
+$OpenBSD: patch-include_vlc_cpu_h,v 1.1 2013/01/03 03:07:29 brad Exp $
+--- include/vlc_cpu.h.orig	Mon Dec 31 21:37:12 2012
++++ include/vlc_cpu.h	Mon Dec 31 21:37:38 2012
+@@ -40,7 +40,7 @@
+ 
+ # if defined (__MMX__)
+ #  define VLC_MMX
+-# elif VLC_GCC_VERSION(4, 4)
++# elif VLC_GCC_VERSION(4, 4) || defined(__clang__)
+ #  define VLC_MMX __attribute__ ((__target__ ("mmx")))
+ # else
+ #  define VLC_MMX VLC_MMX_is_not_implemented_on_this_compiler
+@@ -48,7 +48,7 @@
+ 
+ # if defined (__SSE__)
+ #  define VLC_SSE
+-# elif VLC_GCC_VERSION(4, 4)
++# elif VLC_GCC_VERSION(4, 4) || defined(__clang__)
+ #  define VLC_SSE __attribute__ ((__target__ ("sse")))
+ # else
+ #  define VLC_SSE VLC_SSE_is_not_implemented_on_this_compiler

x11/vlc/patches/patch-modules_video_filter_deinterlace_yadif_h

@@ -0,0 +1,30 @@
+$OpenBSD: patch-modules_video_filter_deinterlace_yadif_h,v 1.1 2013/01/03 03:07:29 brad Exp $
+--- modules/video_filter/deinterlace/yadif.h.orig	Mon Dec 31 21:34:43 2012
++++ modules/video_filter/deinterlace/yadif.h	Mon Dec 31 21:35:48 2012
+@@ -39,7 +39,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x000100
+ 
+ 
+ #ifdef CAN_COMPILE_SSSE3
+-#if defined(__SSE__) || VLC_GCC_VERSION(4, 4)
++#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) || defined(__clang__)
+ // ================ SSSE3 =================
+ #define HAVE_YADIF_SSSE3
+ #define COMPILE_TEMPLATE_SSE 1
+@@ -55,7 +55,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x000100
+ #endif
+ 
+ #ifdef CAN_COMPILE_SSE2
+-#if defined(__SSE__) || VLC_GCC_VERSION(4, 4)
++#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) || defined(__clang__)
+ // ================= SSE2 =================
+ #define HAVE_YADIF_SSE2
+ #define COMPILE_TEMPLATE_SSE 1
+@@ -69,7 +69,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x000100
+ #endif
+ 
+ #ifdef CAN_COMPILE_MMX
+-#if defined(__MMX__) || VLC_GCC_VERSION(4, 4)
++#if defined(__MMX__) || VLC_GCC_VERSION(4, 4) || defined(__clang__)
+ // ================ MMX =================
+ #define HAVE_YADIF_MMX
+ #define VLC_TARGET VLC_MMX