diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-13 16:32:51 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-13 16:32:51 +0000 |
| commit | b24dbcbdd6a9c07b0c02d6748698f1f406718aaf (patch) | |
| tree | 2b8defb2b6e4930f0dd3df87b06cedbe5842afa9 | |
| parent | 738a89b93aefceccc519fed787f5d35d77e9ac73 (diff) | |
| download | ffmpeg-b24dbcbdd6a9c07b0c02d6748698f1f406718aaf.tar.gz | |
Move arch check before OS check.
Originally committed as revision 13146 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 138 |
1 files changed, 69 insertions, 69 deletions
@@ -1063,6 +1063,75 @@ nm="${cross_prefix}${nm}" ranlib="${cross_prefix}${ranlib}" strip="${cross_prefix}${strip}" +case "$arch" in + i386|i486|i586|i686|i86pc|BePC) + arch="x86_32" + enable fast_unaligned + ;; + x86_64|amd64) + arch="x86_32" + enable fast_unaligned + check_cc <<EOF && enable fast_64bit && arch="x86_64" + int test[sizeof(char*) - 7]; +EOF + ;; + # armv4l is a subset of armv[567]*l + arm|armv[4567]*l) + arch="armv4l" + ;; + alpha) + arch="alpha" + enable fast_64bit + ;; + "Power Macintosh"|ppc|powerpc) + arch="powerpc" + ;; + ppc64) + arch="powerpc" + enable fast_64bit + ;; + mips|mipsel|IP*) + arch="mips" + ;; + sun4u|sparc64) + arch="sparc64" + enable fast_64bit + ;; + sparc) + arch="sparc" + ;; + sh4) + arch="sh4" + ;; + parisc) + arch="parisc" + ;; + parisc64) + arch="parisc" + enable fast_64bit + ;; + s390|s390x) + arch="s390" + ;; + m68k) + arch="m68k" + ;; + ia64) + arch="ia64" + enable fast_64bit + ;; + bfin) + arch="bfin" + ;; + *) + arch="unknown" + ;; +esac + +enable $arch +enabled_any x86_32 x86_64 && enable x86 +enabled sparc64 && enable sparc + # OS specific case $target_os in beos|haiku|zeta) @@ -1236,75 +1305,6 @@ disabled logging && logfile=/dev/null echo "# $0 $@" >$logfile set >>$logfile -case "$arch" in - i386|i486|i586|i686|i86pc|BePC) - arch="x86_32" - enable fast_unaligned - ;; - x86_64|amd64) - arch="x86_32" - enable fast_unaligned - check_cc <<EOF && enable fast_64bit && arch="x86_64" - int test[sizeof(char*) - 7]; -EOF - ;; - # armv4l is a subset of armv[567]*l - arm|armv[4567]*l) - arch="armv4l" - ;; - alpha) - arch="alpha" - enable fast_64bit - ;; - "Power Macintosh"|ppc|powerpc) - arch="powerpc" - ;; - ppc64) - arch="powerpc" - enable fast_64bit - ;; - mips|mipsel|IP*) - arch="mips" - ;; - sun4u|sparc64) - arch="sparc64" - enable fast_64bit - ;; - sparc) - arch="sparc" - ;; - sh4) - arch="sh4" - ;; - parisc) - arch="parisc" - ;; - parisc64) - arch="parisc" - enable fast_64bit - ;; - s390|s390x) - arch="s390" - ;; - m68k) - arch="m68k" - ;; - ia64) - arch="ia64" - enable fast_64bit - ;; - bfin) - arch="bfin" - ;; - *) - arch="unknown" - ;; -esac - -enable $arch -enabled_any x86_32 x86_64 && enable x86 -enabled sparc64 && enable sparc - # Combine FFLDFLAGS and the LDFLAGS environment variable. LDFLAGS="$FFLDFLAGS $LDFLAGS" |