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>
This commit is contained in:
Martin Jansa
2012-01-11 08:53:39 +01:00
parent 3b111fefe1
commit d792afdefc
3 changed files with 6 additions and 17 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm"
# faac faad2 lame schroedinger libgsm # faac faad2 lame schroedinger libgsm
DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}"
INC_PR = "r2" INC_PR = "r3"
inherit autotools pkgconfig inherit autotools pkgconfig
@@ -22,7 +22,7 @@ inherit autotools pkgconfig
B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" 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}" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
ARM_INSTRUCTION_SET = "ARM" ARM_INSTRUCTION_SET = "ARM"
PV = "2.0+gitr${SRCPV}" PV = "2.0+gitr${SRCPV}"
PR = "r5" PR = "r6"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
@@ -130,7 +130,7 @@ EXTRA_OECONF = " \
EXTRA_OECONF_append_armv6 = " --enable-armv6" EXTRA_OECONF_append_armv6 = " --enable-armv6"
EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" 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}" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
CFLAGS_append = " -I${S}/libdvdread4 " CFLAGS_append = " -I${S}/libdvdread4 "
+2 -13
View File
@@ -1,7 +1,7 @@
DESCRIPTION = "vpx Multi-Format Codec SDK" DESCRIPTION = "vpx Multi-Format Codec SDK"
LICENSE = "BSD" LICENSE = "BSD"
INC_PR = "r2" INC_PR = "r3"
SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
S = "${WORKDIR}/libvpx-v${PV}" 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' # 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" ARM_INSTRUCTION_SET = "arm"
#-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see CFLAGS += "-fPIC"
# 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"
export CC export CC
export LD = "${CC}" export LD = "${CC}"