[FFmpeg-devel] [PATCH] Fix configure on OS X 10.6

[David Conrad]

On Oct 1, 2009, at 4:42 AM, M?ns Rullg?rd wrote:

> David Conrad <lessen42 at gmail.com> writes:
>
>> On Sep 30, 2009, at 8:06 PM, David Conrad wrote:
>>
>>> Hi,
>>>
>>> uname -m on 10.6 returns i386 on 10.6 (unless you use a 64-bit
>>> kernel which is you don't by default), but gcc now defaults to
>>> producing x86_64 code on 10.6 if you have a CPU capable of running
>>> it regardless.
>>>
>>> Thus, this moves the compile check for x86_64 to also be run if a
>>> 32-bit arch is detected.
>>
>> Merging the x86_32 and x86_64 sections is a bit better; cmov and
>> fast_cmov were being disabled previously.
>>
>>
>> commit 456a5bc279cd658e348bec4e84e673b3a4b62a8b
>> Author: David Conrad <lessen42 at gmail.com>
>> Date:   Wed Sep 30 19:55:30 2009 -0400
>>
>>    Check whether 32-bit x86 is really 64-bit
>>    Fixes configure on OS X 10.6
>>
>> diff --git a/configure b/configure
>> index 4e24df0..ab71cb3 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1817,20 +1817,17 @@ case "$arch" in
>>         enable fast_64bit
>>         spic=$shared
>>     ;;
>> -    i386|i486|i586|i686|i86pc|BePC)
>> +    i386|i486|i586|i686|i86pc|BePC|x86_64|amd64)
>>         arch="x86"
>>         subarch="x86_32"
>>         enable fast_unaligned
>> -    ;;
>> -    x86_64|amd64)
>> -        arch="x86"
>> -        subarch="x86_32"
>> -        enable cmov
>> -        enable fast_cmov
>> -        enable fast_unaligned
>>         check_cc <<EOF && enable fast_64bit && subarch="x86_64" &&  
>> spic=$shared
>>         int test[sizeof(char*) - 7];
>> EOF
>> +        if test "$subarch" = "x86_64"; then
>> +            enable cmov
>> +            enable fast_cmov
>> +        fi
>>     ;;
>>     *)
>>         arch="unknown"
>
> OK

Applied