Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Unified Diff: source/libvpx/build/make/configure.sh

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/build/make/ads2gas.pl ('k') | source/libvpx/configure » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/build/make/configure.sh
===================================================================
--- source/libvpx/build/make/configure.sh (revision 177019)
+++ source/libvpx/build/make/configure.sh (working copy)
@@ -436,10 +436,10 @@
EOF
if enabled rvct; then cat >> $1 << EOF
-fmt_deps = sed -e 's;^__image.axf;\$\${@:.d=.o} \$\$@;' #hide
+fmt_deps = sed -e 's;^__image.axf;\${@:.d=.o} \$@;' #hide
EOF
else cat >> $1 << EOF
-fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\$\${@:.d=.o} \$\$@;'
+fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\${@:.d=.o} \$@;'
EOF
fi
@@ -597,8 +597,13 @@
armv6*)
tgt_isa=armv6
;;
+ armv7*-hardfloat*)
+ tgt_isa=armv7
+ float_abi=hard
+ ;;
armv7*)
tgt_isa=armv7
+ float_abi=softfp
;;
armv5te*)
tgt_isa=armv5te
@@ -642,6 +647,9 @@
tgt_isa=x86_64
tgt_os=darwin12
;;
+ x86_64*mingw32*)
+ tgt_os=win64
+ ;;
*mingw32*|*cygwin*)
[ -z "$tgt_isa" ] && tgt_isa=x86
tgt_os=win32
@@ -768,6 +776,7 @@
;;
armv5te)
soft_enable edsp
+ disable fast_unaligned
;;
esac
@@ -783,8 +792,9 @@
check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune="
if [ ${tgt_isa} == "armv7" ]; then
- check_add_cflags -march=armv7-a -mfloat-abi=softfp
- check_add_asflags -march=armv7-a -mfloat-abi=softfp
+ [ -z "${float_abi}" ] && float_abi=softfp
+ check_add_cflags -march=armv7-a -mfloat-abi=${float_abi}
+ check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
if enabled neon
then
@@ -1001,7 +1011,11 @@
soft_enable sse2
soft_enable sse3
soft_enable ssse3
- soft_enable sse4_1
+ if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then
+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
+ else
+ soft_enable sse4_1
+ fi
case ${tgt_os} in
win*)
@@ -1075,7 +1089,7 @@
add_asflags -f x64
enabled debug && add_asflags -g cv8
;;
- linux*|solaris*)
+ linux*|solaris*|android*)
add_asflags -f elf${bits}
enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
enabled debug && [ "${AS}" = nasm ] && add_asflags -g
« no previous file with comments | « source/libvpx/build/make/ads2gas.pl ('k') | source/libvpx/configure » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698