pixman: Branch 'master'

[GitLab Mirror]

 meson.build |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 92ee80d42356eff9be0a9b493d3e70d4e8746732
Author: Charlie Jenkins <charlie at rivosinc.com>
Date:   Mon Apr 21 13:08:50 2025 -0700

    RISC-V: Only enable RVV on linux if hwcap headers are available
    
    Linux 6.5 introduced COMPAT_HWCAP_ISA_V. When trying to compile pixman
    against linux headers older than this, pixman will fail to compile
    because it assumes COMPAT_HWCAP_ISA_V exists.
    
    During meson configuration, do not enable have_rvv if the platform is
    Linux and COMPAT_HWCAP_ISA_V doesn't exist.
    
    Signed-off-by: Charlie Jenkins <charlie at rivosinc.com>
    Fixes: 0e424031bda2 ("RISC-V floating point operations")

diff --git a/meson.build b/meson.build
index 9cf1bf0..a8c596f 100644
--- a/meson.build
+++ b/meson.build
@@ -372,6 +372,10 @@ if not use_rvv.disabled()
   if host_machine.cpu_family() == 'riscv64'
     if cc.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() {
             vfloat32m1_t tmp1; /* added in gcc-13 */
             vfloat32m1x4_t tmp2; /* added in gcc-14 */