summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Finegan <tomfinegan@google.com>2014-06-11 12:13:11 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-06-11 12:13:11 -0700
commit5d35bc686b0e3a5b354d51736de61e3ef0b4059d (patch)
tree387af0e248128e4ccef3bcb54128ec6d8cd28505
parente6fadb5ba88e4c600c7a9245c26c722d6dcb34ed (diff)
parentcd2088b44fc3dd1db34f94674134cb594b3369d0 (diff)
downloadlibvpx-5d35bc686b0e3a5b354d51736de61e3ef0b4059d.tar
libvpx-5d35bc686b0e3a5b354d51736de61e3ef0b4059d.tar.gz
libvpx-5d35bc686b0e3a5b354d51736de61e3ef0b4059d.tar.bz2
libvpx-5d35bc686b0e3a5b354d51736de61e3ef0b4059d.zip
Merge "Add target armv7s-darwin-gcc."
-rw-r--r--README3
-rwxr-xr-xbuild/make/configure.sh4
-rwxr-xr-xconfigure1
3 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index d3cb30236..f20910517 100644
--- a/README
+++ b/README
@@ -62,6 +62,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
armv7-none-rvct
armv7-win32-vs11
armv7-win32-vs12
+ armv7s-darwin-gcc
mips32-linux-gcc
ppc32-darwin8-gcc
ppc32-darwin9-gcc
@@ -79,6 +80,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86-darwin11-gcc
x86-darwin12-gcc
x86-darwin13-gcc
+ x86-iphonesimulator-gcc
x86-linux-gcc
x86-linux-icc
x86-os2-gcc
@@ -95,6 +97,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86_64-darwin11-gcc
x86_64-darwin12-gcc
x86_64-darwin13-gcc
+ x86_64-iphonesimulator-gcc
x86_64-linux-gcc
x86_64-linux-icc
x86_64-solaris-gcc
diff --git a/build/make/configure.sh b/build/make/configure.sh
index e0d6a54b2..d4124c722 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -802,7 +802,7 @@ process_common_toolchain() {
armv8)
soft_enable neon
;;
- armv7)
+ armv7|armv7s)
soft_enable neon
soft_enable neon_asm
soft_enable media
@@ -831,7 +831,7 @@ process_common_toolchain() {
arch_int=${arch_int%%te}
check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune="
- if [ ${tgt_isa} = "armv7" ]; then
+ if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
if [ -z "${float_abi}" ]; then
check_cpp <<EOF && float_abi=hard || float_abi=softfp
#ifndef __ARM_PCS_VFP
diff --git a/configure b/configure
index 0cacc4c47..800553eb4 100755
--- a/configure
+++ b/configure
@@ -103,6 +103,7 @@ all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-win32-vs11"
all_platforms="${all_platforms} armv7-win32-vs12"
+all_platforms="${all_platforms} armv7s-darwin-gcc"
all_platforms="${all_platforms} mips32-linux-gcc"
all_platforms="${all_platforms} ppc32-darwin8-gcc"
all_platforms="${all_platforms} ppc32-darwin9-gcc"