diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-01-11 08:53:39 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-01-12 10:41:09 +0100 |
| commit | d792afdefcacc3ff660348d7be3b3f2a802ae163 (patch) | |
| tree | d81e0959469f0503bb894af932de4f96a7366159 | |
| parent | 3b111fefe106d93a1a199e63dc9056985fb9886d (diff) | |
| download | meta-openembedded-contrib-d792afdefcacc3ff660348d7be3b3f2a802ae163.tar.gz | |
libav, libvpx, mplayer2: drop work around for gcc-4.6 ICE, no need to pass -fno-tree-vectorize now
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-multimedia/libav/libav.inc | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx.inc | 15 |
3 files changed, 6 insertions, 17 deletions
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 89b14ca6c6..2e3d1c9d21 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc @@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm" # faac faad2 lame schroedinger libgsm DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" -INC_PR = "r2" +INC_PR = "r3" inherit autotools pkgconfig @@ -22,7 +22,7 @@ inherit autotools pkgconfig B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fno-tree-vectorize -fomit-frame-pointer -O4 -ffast-math" +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 2a2d8af7b4..7ed905563d 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb @@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac" ARM_INSTRUCTION_SET = "ARM" PV = "2.0+gitr${SRCPV}" -PR = "r5" +PR = "r6" PARALLEL_MAKE = "" @@ -130,7 +130,7 @@ EXTRA_OECONF = " \ EXTRA_OECONF_append_armv6 = " --enable-armv6" EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math -fno-tree-vectorize" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" CFLAGS_append = " -I${S}/libdvdread4 " diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc index 8434f38410..31dafb8c8c 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx.inc +++ b/meta-oe/recipes-multimedia/webm/libvpx.inc @@ -1,7 +1,7 @@ DESCRIPTION = "vpx Multi-Format Codec SDK" LICENSE = "BSD" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" S = "${WORKDIR}/libvpx-v${PV}" @@ -10,18 +10,7 @@ S = "${WORKDIR}/libvpx-v${PV}" # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' ARM_INSTRUCTION_SET = "arm" -#-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see -# http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html -#| [CC] vpx_scale/generic/gen_scalers.c.o -#| vpx_scale/generic/gen_scalers.c: In function 'vp8cx_vertical_band_3_4_scale_c': -#| vpx_scale/generic/gen_scalers.c:537:6: internal compiler error: in vect_get_vec_def_for_stmt_copy, at tree-vect-stmts.c:1390 -#| Please submit a full bug report, -#| with preprocessed source if appropriate. -#| See <http://gcc.gnu.org/bugs.html> for instructions. -#| make[1]: *** [vpx_scale/generic/gen_scalers.c.o] Error 1 -#| make: *** [.DEFAULT] Error 2 - -CFLAGS += "-fPIC -fno-tree-vectorize" +CFLAGS += "-fPIC" export CC export LD = "${CC}" |