summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-16 21:34:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-16 21:34:14 +0100
commitb37852c7d9bc81dface8c8b4143301af914ef9a4 (patch)
treeef67bbc4af983bcf01f911faa4f761b962f21420 /configure
parent6416dce490f7af291098caf8ccccbc2bc6804dce (diff)
parent3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea (diff)
Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea': configure: handle Apple's armv7s in probe_arm_arch() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 7ade46dc54..6d28db3c71 100755
--- a/configure
+++ b/configure
@@ -3751,6 +3751,7 @@ elif enabled arm; then
elif check_arm_arch 6T2; then echo armv6t2;
elif check_arm_arch 7; then echo armv7;
elif check_arm_arch 7A 7_A; then echo armv7-a;
+ elif check_arm_arch 7S; then echo armv7-a;
elif check_arm_arch 7R 7_R; then echo armv7-r;
elif check_arm_arch 7M 7_M; then echo armv7-m;
elif check_arm_arch 7EM 7E_M; then echo armv7-m;