Changeset 5a96b059302cea50584969fe7b0bfbd2589d29bf

Timestamp:

04/28/08 18:25:24 (3 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1209399924 +0300

git-parent:

[f458ada1046dcf8ab43b33010ebac061c8512f11]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1209399924 +0300

Message:

Fix accelerated modules configure options.

Only enable those modules that were enabled, rather than _all_ of them
(which should fix --disable-sse and --disable-mmx). Also don't run
checks if we know we're not going to enable the modules anyway.

Files:

• configure.ac (modified) (9 diffs)

configure.ac

@@ -1241 +1241 @@
-dnl  Accelerated modules
-dnl
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-dnl  We need support for -mmmx, we need <mmintrin.h>, and we also need a
-dnl  working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    [ac_cv_c_mmx_intrinsics],
-    [CFLAGS="${CFLAGS_save} -O -mmmx"
@@ -1271 +1278 @@
-                    [ac_cv_c_mmx_intrinsics=yes],
-                    [ac_cv_c_mmx_intrinsics=no])])
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-dnl  Check for fully workin SSE2 intrinsics
-dnl  We need support for -mmmx, we need <emmintrin.h>, and we also need a
-dnl  working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    [ac_cv_c_sse2_intrinsics],
-    [CFLAGS="${CFLAGS_save} -O -msse2"
@@ -1296 +1345 @@
-                    [ac_cv_c_sse2_intrinsics=yes],
-                    [ac_cv_c_sse2_intrinsics=no])])
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    [CFLAGS="${CFLAGS_save}"
-packuswb %%mm1,%%
-mmx_inline=yes, ac_cv_mmx
-
-AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.)
-ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
-
-
-AC_CACHE_CHECK([if \$CC groks MMX EXT
-mmxext
+xorps %%xmm1,%%x
+sse_inline=yes, ac_cv_sse
+
+  AC_DEFINE(CAN_COMPILE_SSE, 1,
+            [Define to 1 if SSE inline assembly is available.])
+
+
+  AC_CACHE_CHECK([if $CC groks SSE2
+sse2
-    [CFLAGS="${CFLAGS_save}"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    [ac_cv_3dnow_inline],
-    [CFLAGS="${CFLAGS_save}"
-     AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
-                    ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    [ac_cv_altivec_inline],
-    [CFLAGS="${CFLAGS_save}"
-     AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
-yes
+"yes"
-         [CFLAGS="${CFLAGS_save} -Wa,-m7400"
-          AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
@@ -1362 +1403 @@
-            ac_cv_altivec_inline=no)
-         ])])
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-dnl The AltiVec C extensions
@@ -1384 +1427 @@
-dnl - Linux PPC, gcc 3.x: need <altivec.h> and -fvec
-dnl - Others: test should fail
-
+  
-  [ac_cv_c_altivec],
-  [# OS X/PPC test (gcc 4.x)
@@ -1420 +1463 @@
-   CFLAGS="${CFLAGS_save}"
-  ])
-
-
-
-
-
-
-
+
+
+
+
-  AC_CHECK_HEADERS(altivec.h)
-  CPPFLAGS="${CPPFLAGS_save}"
-  
-
-
+
+
+
-    VLC_ADD_CFLAGS([libvlc],[${ac_cv_c_altivec}])
-    VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
-    VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    [ac_cv_ld_altivec],
-    [LDFLAGS="${LDFLAGS_vlc} -Wl,-framework,vecLib"
@@ -1449 +1486 @@
-     LDFLAGS="${LDFLAGS_save}"
-    ])
-
-
-
-
-
-
-
+
+
+
+
-
-dnl
@@ -1496 +1530 @@
-
-dnl
-dnl  x86 accelerations
-dnl
-AC_ARG_ENABLE(mmx,
-[  --disable-mmx       disable MMX optimizations (default enabled on x86)],
-[ if test "${enable_mmx}" = "yes"; then ARCH="${ARCH} mmx";
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ],
-[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64"; then
-    ARCH="${ARCH} mmx"
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ])
-
-AC_ARG_ENABLE(sse,
-[  --disable-sse       disable SSE (1 and 2) optimizations (default enabled on i686 and x86_64)],
-[ if test "${enable_sse}" = "yes"; then ARCH="${ARCH} sse sse2";
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ],
-[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64"; then ARCH="${ARCH} sse sse2";
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ])
-
-dnl
-dnl  Memory usage
-dnl
@@ -1534 +1550 @@
-   fi
-fi
-
-dnl
-dnl  AltiVec acceleration
-dnl
-AC_ARG_ENABLE(altivec,
-[  --disable-altivec       disable AltiVec optimizations (default enabled on PPC)],
-[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec";
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ],
-[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec";
-    VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ])
-
-dnl