Merge branch 'pnggroup:libpng16' into libpng16

Author: sanjay20m

CMakeLists.txt

@@ -331,10 +331,6 @@ if(PNG_HARDWARE_OPTIMIZATIONS)
 
       check_c_source_compiles("
         #include <riscv_vector.h>
-        #include <asm/hwcap.h>
-        #ifndef COMPAT_HWCAP_ISA_V /* added in linux-6.5 */
-        #error \"COMPAT_HWCAP_ISA_V is not available\"
-        #endif
         int main() {
           const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
           uint64_t ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};

configure.ac

@@ -707,10 +707,6 @@ then
 
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <riscv_vector.h>
-#include <asm/hwcap.h>
-#ifndef COMPAT_HWCAP_ISA_V /* added in linux-6.5 */
-#error "COMPAT_HWCAP_ISA_V is not available"
-#endif
 int main() {
    const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
    uint64_t ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};

contrib/riscv-rvv/README

@@ -303,14 +303,16 @@
 #endif
 
 #if PNG_RISCV_RVV_OPT > 0
+#if __riscv_v >= 1000000 && __riscv_v < 1900000
 #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_rvv
 #  ifndef PNG_RISCV_RVV_IMPLEMENTATION
       /* Use the intrinsics code by default. */
 #     define PNG_RISCV_RVV_IMPLEMENTATION 1
 #  endif
 #else
 #  define PNG_RISCV_RVV_IMPLEMENTATION 0
-#endif
+#endif /* __riscv_v >= 1000000 && __riscv_v < 1900000 */
+#endif /* PNG_RISCV_RVV_OPT > 0 */
 
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
@@ -1546,7 +1548,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
-#if PNG_RISCV_RVV_OPT > 0
+#if PNG_RISCV_RVV_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_rvv,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_rvv,(png_row_infop
@@ -2175,7 +2177,7 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
     (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
-#  if PNG_RISCV_RVV_OPT > 0
+#  if PNG_RISCV_RVV_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_rvv,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif

contrib/riscv-rvv/linux.c

@@ -12,25 +12,10 @@
 
 #ifdef PNG_READ_SUPPORTED
 
-#if PNG_RISCV_RVV_OPT > 0
+#if PNG_RISCV_RVV_IMPLEMENTATION == 1
 
 #include <riscv_vector.h>
 
-#include <signal.h>
-
-#ifndef PNG_RISCV_RVV_FILE
-#  if defined(__linux__)
-#    define PNG_RISCV_RVV_FILE "contrib/riscv-rvv/linux.c"
-#  else
-#    error "No support for run-time RISC-V Vector checking; use compile-time options"
-#  endif
-#endif
-
-static int png_have_rvv();
-#ifdef PNG_RISCV_RVV_FILE
-#  include PNG_RISCV_RVV_FILE
-#endif
-
 #ifndef PNG_ALIGNED_MEMORY_SUPPORTED
 #  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
 #endif
@@ -40,14 +25,6 @@ png_init_filter_functions_rvv(png_structp pp, unsigned int bpp)
 {
    png_debug(1, "in png_init_filter_functions_rvv");
 
-   static volatile sig_atomic_t no_rvv = -1; /* not checked */
-
-   if (no_rvv < 0)
-      no_rvv = !png_have_rvv();
-
-   if (no_rvv)
-      return;
-
    pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_rvv;
 
    if (bpp == 3)
@@ -64,5 +41,5 @@ png_init_filter_functions_rvv(png_structp pp, unsigned int bpp)
    }
 }
 
-#endif /* PNG_RISCV_RVV_OPT > 0 */
+#endif /* PNG_RISCV_RVV_IMPLEMENTATION == 1 */
 #endif /* PNG_READ_SUPPORTED */