aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-01-11 22:45:19 +0000
committerDiego Biurrun <diego@biurrun.de>2009-01-11 22:45:19 +0000
commit62045d486041ddb925f5055b6edb602eef6f99a0 (patch)
tree7af0c71b712e2e35979d17c0b0e2eddcd106f163
parent1fc9fb8a77d4dfdb6bc8c9d1b47a0daf0b55f09f (diff)
downloadffmpeg-62045d486041ddb925f5055b6edb602eef6f99a0.tar.gz
Split arch variable into arch and subarch.
Originally committed as revision 16558 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure15
1 files changed, 8 insertions, 7 deletions
diff --git a/configure b/configure
index af4dbca71e..16d5710774 100755
--- a/configure
+++ b/configure
@@ -1305,15 +1305,17 @@ check_cflags -std=c99
case "$arch" in
i386|i486|i586|i686|i86pc|BePC)
- arch="x86_32"
+ arch="x86"
+ subarch="x86_32"
enable fast_unaligned
;;
x86_64|amd64)
- arch="x86_32"
+ arch="x86"
+ subarch="x86_32"
enable cmov
enable fast_cmov
enable fast_unaligned
- check_cc <<EOF && enable fast_64bit && arch="x86_64"
+ check_cc <<EOF && enable fast_64bit && subarch="x86_64"
int test[sizeof(char*) - 7];
EOF
;;
@@ -1341,7 +1343,8 @@ EOF
enable fast_64bit
;;
sun4u|sparc64)
- arch="sparc64"
+ arch="sparc"
+ subarch="sparc64"
enable fast_64bit
;;
sparc)
@@ -1375,9 +1378,7 @@ EOF
;;
esac
-enable $arch
-enabled_any x86_32 x86_64 && enable x86
-enabled sparc64 && enable sparc
+enable $arch $subarch
# OS specific
case $target_os in