Re: [FFmpeg-devel] [PATCH] riscv: Use the correct path for including asm.S

["Rémi Denis-Courmont" <remi@remlab.net>]

Le 28 septembre 2022 10:13:57 GMT+03:00, "Martin Storsjö" <martin@martin.st> a écrit :
>Signed-off-by: Martin Storsjö <martin@martin.st>
>---
>This should hopefully fix the compile failures on fate,
>http://fate.ffmpeg.org/report.cgi?time=20220927222508&slot=riscv64-linux-gnu-gcc-12
>and
>http://fate.ffmpeg.org/report.cgi?time=20220927225014&slot=riscv64-linux-gnu-clang-14.
>---
> libavcodec/riscv/fmtconvert_rvv.S  | 2 +-
> libavcodec/riscv/pixblockdsp_rvi.S | 2 +-
> libavcodec/riscv/vorbisdsp_rvv.S   | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/libavcodec/riscv/fmtconvert_rvv.S b/libavcodec/riscv/fmtconvert_rvv.S
>index c79f80cc47..49893ec8d7 100644
>--- a/libavcodec/riscv/fmtconvert_rvv.S
>+++ b/libavcodec/riscv/fmtconvert_rvv.S
>@@ -19,7 +19,7 @@
>  */
> 
> #include "config.h"
>-#include "../libavutil/riscv/asm.S"
>+#include "libavutil/riscv/asm.S"
> 
> func ff_int32_to_float_fmul_scalar_rvv, zve32f
> NOHWF   fmv.w.x     fa0, a2
>diff --git a/libavcodec/riscv/pixblockdsp_rvi.S b/libavcodec/riscv/pixblockdsp_rvi.S
>index 93ece4405e..e84170244b 100644
>--- a/libavcodec/riscv/pixblockdsp_rvi.S
>+++ b/libavcodec/riscv/pixblockdsp_rvi.S
>@@ -19,7 +19,7 @@
>  */
> 
> #include "config.h"
>-#include "../libavutil/riscv/asm.S"
>+#include "libavutil/riscv/asm.S"
> 
> func ff_get_pixels_8_rvi
> .irp row, 0, 1, 2, 3, 4, 5, 6, 7
>diff --git a/libavcodec/riscv/vorbisdsp_rvv.S b/libavcodec/riscv/vorbisdsp_rvv.S
>index e8953fb548..bbe9c7dc6d 100644
>--- a/libavcodec/riscv/vorbisdsp_rvv.S
>+++ b/libavcodec/riscv/vorbisdsp_rvv.S
>@@ -19,7 +19,7 @@
>  */
> 
> #include "config.h"
>-#include "../libavutil/riscv/asm.S"
>+#include "libavutil/riscv/asm.S"
> 
> func ff_vorbis_inverse_coupling_rvv, zve32f
>         fmv.w.x   ft0, zero
>-- 
>2.37.0 (Apple Git-136)
>
>_______________________________________________
>ffmpeg-devel mailing list
>ffmpeg-devel@ffmpeg.org
>https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>To unsubscribe, visit link above, or email
>ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Why does this affect FATE only? Is it building in the source directory? (My local builds are in a subdirectory.)

LGTM though
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".