| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | It will add -mips64r6 and -mips64r2 to cmdline which will |
| 2 | cause conflicts |
| 3 | |
| 4 | in OE we user mips32r2 and mips64r2 for mips arch versions |
| 5 | so there is no benefit of detecting it automatically by |
| 6 | poking at tools especially in cross env |
| 7 | |
| 8 | Fixes errors like |
| 9 | |
| 10 | linking -mnan=2008 module with previous -mnan=legacy modules |
| 11 | failed to merge target specific data of file |
| 12 | |
| 13 | -Khem |
| 14 | Upstream-Status: Inappropriate [OE-Specific] |
| 15 | |
| 16 | Index: gst-libav-1.10.1/gst-libs/ext/libav/configure |
| 17 | =================================================================== |
| 18 | --- gst-libav-1.10.1.orig/gst-libs/ext/libav/configure |
| 19 | +++ gst-libav-1.10.1/gst-libs/ext/libav/configure |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 20 | @@ -5650,12 +5650,9 @@ elif enabled mips; then |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | |
| 22 | # Enable minimum ISA based on selected options |
| 23 | if enabled mips64; then |
| 24 | - enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' |
| 25 | enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' |
| 26 | disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' |
| 27 | else |
| 28 | - enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' |
| 29 | - enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' |
| 30 | enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' |
| 31 | disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' |
| 32 | fi |