summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorJunxian Zhu <zhujunxian@oss.cipunited.com>2022-12-01 15:00:06 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2023-03-26 01:46:39 +0100
commit5ffe18bcea9fcb1b3c816b8faeffcb17ca4b2669 (patch)
treec2e98fb4091ba360aeee2f4b77d582b038283176 /libavutil
parent653ee3f159411a1b97c19b96393a39f29569ed99 (diff)
downloadffmpeg-5ffe18bcea9fcb1b3c816b8faeffcb17ca4b2669.tar.gz
mips: fix build fail on MIPS R6
Add macro define to avoid causing build fail with incompatible assembler code on MIPS R6. Signed-off-by: Junxian Zhu <zhujunxian@oss.cipunited.com> Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/mips/generic_macros_msa.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/mips/generic_macros_msa.h b/libavutil/mips/generic_macros_msa.h
index 1486f7296e..9beb0443ed 100644
--- a/libavutil/mips/generic_macros_msa.h
+++ b/libavutil/mips/generic_macros_msa.h
@@ -44,7 +44,7 @@
#define ST_UW(...) ST_V(v4u32, __VA_ARGS__)
#define ST_SW(...) ST_V(v4i32, __VA_ARGS__)
-#if (__mips_isa_rev >= 6)
+#if HAVE_MIPS32R6 || HAVE_MIPS64R6
#define LH(psrc) \
( { \
uint16_t val_lh_m = *(uint16_t *)(psrc); \
@@ -85,7 +85,7 @@
#define SW(val, pdst) *(uint32_t *)(pdst) = (val);
#define SD(val, pdst) *(uint64_t *)(pdst) = (val);
-#else // !(__mips_isa_rev >= 6)
+#else // !HAVE_MIPS32R6 && !HAVE_MIPS64R6
#define LH(psrc) \
( { \
uint8_t *psrc_lh_m = (uint8_t *) (psrc); \
@@ -188,7 +188,7 @@
SW(val0_sd_m, pdst_sd_m); \
SW(val1_sd_m, pdst_sd_m + 4); \
}
-#endif // (__mips_isa_rev >= 6)
+#endif // HAVE_MIPS32R6 || HAVE_MIPS64R6
/* Description : Load 4 words with stride
Arguments : Inputs - psrc (source pointer to load from)