diff --git a/Makefile.am b/Makefile.am index 44ab0ea0c..455b6cfc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,8 +135,11 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += powerpc/powerpc_init.c\ endif if PNG_RISCV_RVV -libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += riscv/riscv_init.c\ +noinst_LTLIBRARIES= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@rvv.la +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@rvv_la_SOURCES = riscv/riscv_init.c\ riscv/filter_rvv_intrinsics.c +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@rvv_la_CFLAGS = -march=rv64gv +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@rvv.la endif if PNG_LOONGARCH_LSX @@ -145,7 +148,6 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx_la_SOURCES = loongarch/loongarch_lsx_init. loongarch/filter_lsx_intrinsics.c libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx_la_CFLAGS = -mlsx libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la -# libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la endif nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h @@ -168,6 +170,10 @@ else libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym endif +if PNG_RISCV_RVV + libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES += libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@rvv.la +endif + if PNG_LOONGARCH_LSX libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES += libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la endif diff --git a/configure.ac b/configure.ac index f178bde08..f7e11300a 100644 --- a/configure.ac +++ b/configure.ac @@ -714,6 +714,9 @@ if test "$enable_riscv_rvv" != "no" && then compiler_support_riscv_rvv=no AC_MSG_CHECKING(whether to use RISC-V RVV intrinsics) + + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -march=rv64gv" AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include int main(){ @@ -726,6 +729,7 @@ int main(){ else AC_MSG_WARN([Compiler does not support riscv rvv.]) fi + CFLAGS=$save_CFLAGS fi # Add RISC-V-specific files to all builds where $host_cpu is riscv ('riscv64')