Date: Fri, 18 Oct 2013 07:45:48 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330729 - in head/multimedia/mplayer: . files Message-ID: <201310180745.r9I7jnuV085170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Oct 18 07:45:48 2013 New Revision: 330729 URL: http://svnweb.freebsd.org/changeset/ports/330729 Log: Fix build on i386 with clang. Some inline asm requires 7 registers but only 6 are available because clang assumes the stack is 4-byte aligned and there's a local variable that requires 16-byte alignment so the stack has to be realigned which requires one register to be used as frame pointer. PR: ports/180564 Submitted by: dt71@gmx.com Approved by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer) Added: head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c (contents, props changed) Modified: head/multimedia/mplayer/Makefile.options Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Fri Oct 18 07:44:30 2013 (r330728) +++ head/multimedia/mplayer/Makefile.options Fri Oct 18 07:45:48 2013 (r330729) @@ -50,7 +50,7 @@ CFLAGS+= -O -fomit-frame-pointer .endif #DEBUG #Supported architectures for clang -.if ${ARCH} == "amd64" +.if ${ARCH} == "amd64" || ${ARCH} == "i386" MPLAYER_CLANG_SUPPORTED_ARCH= yes .endif Added: head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c Fri Oct 18 07:45:48 2013 (r330729) @@ -0,0 +1,11 @@ +--- ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:20.000000000 +0200 ++++ ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:45.000000000 +0200 +@@ -51,7 +51,7 @@ + extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); + extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); + +-#if ARCH_X86_32 && defined(__INTEL_COMPILER) ++#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__)) + # undef HAVE_7REGS + # define HAVE_7REGS 0 + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310180745.r9I7jnuV085170>