[FFmpeg-devel] [PATCH 2/2] configure: build fix for mips cpu p5600

[Michael Niedermayer]

On Tue, Mar 01, 2016 at 06:41:18PM +0530, shivraj.patil at imgtec.com wrote:
> From: Shivraj Patil <shivraj.patil at imgtec.com>
> 
> For P5600 mips cpu, cpuflags="-march=p5600" sets mips32r5 by default.
> Current configuration sets mips32r2 for p5600 cpu, hence ldflag check results in,
> error: '-mips32r2' conflicts with the other architecture options, which specify a mips32r5 processor
> 
> Due to above error, mips32r2 gets disabled avoiding necessary msa flag settings, which breaks the build.
> To fix this issue, introduced mips32r5 in mips arch list which is more appropriate.
> 
> Signed-off-by: Shivraj Patil <shivraj.patil at imgtec.com>
> ---
>  configure |   23 ++++++++++++++++++++---
>  1 file changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 3f4a0c7..df9bb74 100755
> --- a/configure
> +++ b/configure
> @@ -1661,6 +1661,7 @@ ARCH_EXT_LIST_ARM="
>  ARCH_EXT_LIST_MIPS="
>      mipsfpu
>      mips32r2
> +    mips32r5
>      mips64r2
>      mips32r6
>      mips64r6
> @@ -4174,6 +4175,7 @@ elif enabled mips; then
>  
>      case $cpu in
>          24kc)
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4186,6 +4188,7 @@ elif enabled mips; then
>              disable mmi
>          ;;
>          24kf*)
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4197,6 +4200,7 @@ elif enabled mips; then
>              disable mmi
>          ;;
>          24kec|34kc|1004kc)
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4208,6 +4212,7 @@ elif enabled mips; then
>              disable mmi
>          ;;
>          24kef*|34kf*|1004kf*)
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4218,6 +4223,7 @@ elif enabled mips; then
>              disable mmi
>          ;;
>          74kc)
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4237,6 +4243,7 @@ elif enabled mips; then
>              disable mmi
>          ;;
>          p5600)
> +            disable mips32r2
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4251,6 +4258,7 @@ elif enabled mips; then
>          ;;
>          i6400)
>              disable mips32r2
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mipsdsp
> @@ -4265,6 +4273,7 @@ elif enabled mips; then
>          ;;
>          loongson*)
>              disable mips32r2
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6
> @@ -4300,6 +4309,7 @@ elif enabled mips; then
>              warn "unknown CPU. Disabling all MIPS optimizations."
>              disable mipsfpu
>              disable mips32r2
> +            disable mips32r5
>              disable mips32r6
>              disable mips64r2
>              disable mips64r6

some working autodetection or factorizing this code or using
dependancies like
mips32r6_dep = "mips32r5"
mips32r5_dep = "mips32r2"
mips32r2_dep = "mips32"
(the deps will maybe not work depending on where the code using
 the stuff is)

would be cleaner i think  than repeating the list of disables

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

DNS cache poisoning attacks, popular search engine, Google internet authority
dont be evil, please
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160302/fddd182d/attachment.sig>