This should fix the build on LLVM 16 and earlier, at the cost of turning all non-RVV optimisations off.
Showing the changes to libavcodec (5 of 13 files). Show all
Unified · Split
| @@ -1,15 +1,15 @@ | ||
| 1 | 1 | OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o |
| 2 | 2 | RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o |
| 3 | −OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \ | |
| 4 | − riscv/ac3dsp_rvb.o | |
| 3 | +OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o | |
| 4 | +RV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvb.o | |
| 5 | 5 | RVV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvv.o |
| 6 | 6 | OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o |
| 7 | 7 | RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o |
| 8 | −OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \ | |
| 9 | − riscv/audiodsp_rvf.o | |
| 8 | +OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o | |
| 9 | +RV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvf.o | |
| 10 | 10 | RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o |
| 11 | −OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \ | |
| 12 | − riscv/bswapdsp_rvb.o | |
| 11 | +OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o | |
| 12 | +RV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvb.o | |
| 13 | 13 | RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o |
| 14 | 14 | OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o |
| 15 | 15 | RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o |
| @@ -35,8 +35,8 @@ OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_init.o · 19 unmodified lines | ||
| 35 | 35 | RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o |
| 36 | 36 | OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o |
| 37 | 37 | RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o |
| 38 | −OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \ | |
| 39 | − riscv/pixblockdsp_rvi.o | |
| 38 | +OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o | |
| 39 | +RV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvi.o | |
| 40 | 40 | RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o |
| 41 | 41 | OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o |
| 42 | 42 | RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o |
| @@ -31,6 +31,7 @@ void ff_float_to_fixed24_rvv(int32_t *dst, const float *src, size_t len); · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) |
| 33 | 33 | { |
| 34 | +#if HAVE_RV | |
| 34 | 35 | int flags = av_get_cpu_flags(); |
| 35 | 36 | |
| 36 | 37 | if (flags & AV_CPU_FLAG_RVB_ADDR) { |
| @@ -39,4 +40,5 @@ av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) · 2 unmodified lines | ||
| 39 | 40 | if (flags & AV_CPU_FLAG_RVV_F32) |
| 40 | 41 | c->float_to_fixed24 = ff_float_to_fixed24_rvv; |
| 41 | 42 | } |
| 43 | +#endif | |
| 42 | 44 | } |
| @@ -33,6 +33,7 @@ void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min, float · 32 unmodified lines | ||
| 33 | 33 | |
| 34 | 34 | av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) |
| 35 | 35 | { |
| 36 | +#if HAVE_RV | |
| 36 | 37 | int flags = av_get_cpu_flags(); |
| 37 | 38 | |
| 38 | 39 | if (flags & AV_CPU_FLAG_RVF) |
| @@ -47,4 +48,5 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) · 8 unmodified lines | ||
| 47 | 48 | c->vector_clipf = ff_vector_clipf_rvv; |
| 48 | 49 | } |
| 49 | 50 | #endif |
| 51 | +#endif | |
| 50 | 52 | } |
| @@ -30,6 +30,7 @@ void ff_bswap16_buf_rvv(uint16_t *dst, const uint16_t *src, int len); · 29 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c) |
| 32 | 32 | { |
| 33 | +#if HAVE_RV | |
| 33 | 34 | int flags = av_get_cpu_flags(); |
| 34 | 35 | |
| 35 | 36 | if (flags & AV_CPU_FLAG_RVB_ADDR) { |
| @@ -42,4 +43,5 @@ av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c) · 6 unmodified lines | ||
| 42 | 43 | c->bswap16_buf = ff_bswap16_buf_rvv; |
| 43 | 44 | #endif |
| 44 | 45 | } |
| 46 | +#endif | |
| 45 | 47 | } |
| @@ -45,6 +45,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 44 unmodified lines | ||
| 45 | 45 | AVCodecContext *avctx, |
| 46 | 46 | unsigned high_bit_depth) |
| 47 | 47 | { |
| 48 | +#if HAVE_RV | |
| 48 | 49 | int cpu_flags = av_get_cpu_flags(); |
| 49 | 50 | |
| 50 | 51 | if (cpu_flags & AV_CPU_FLAG_RVI) { |
| @@ -69,4 +70,5 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 18 unmodified lines | ||
| 69 | 70 | c->diff_pixels = ff_diff_pixels_rvv; |
| 70 | 71 | } |
| 71 | 72 | #endif |
| 73 | +#endif | |
| 72 | 74 | } |