CVS commit: pkgsrc/emulators/qemu

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 25 18:46:08 UTC 2022

Modified Files:
        pkgsrc/emulators/qemu: distinfo
Added Files:
        pkgsrc/emulators/qemu/patches: patch-target_arm_translate-sve.c

Log Message:
qemu: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.196 pkgsrc/emulators/qemu/distinfo:1.197
--- pkgsrc/emulators/qemu/distinfo:1.196        Tue Oct 25 18:32:29 2022
+++ pkgsrc/emulators/qemu/distinfo      Tue Oct 25 18:46:08 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.196 2022/10/25 18:32:29 jperkin Exp $
+$NetBSD: distinfo,v 1.197 2022/10/25 18:46:08 jperkin Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -19,6 +19,7 @@ SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
 SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
+SHA1 (patch-target_arm_translate-sve.c) = f5909d20ea6f04bbc4a0d61d79f795bac24d6d86
 SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
 SHA1 (patch-target_i386_meson.build) = 0ef0636dd68e5eeb9a2a34473e2a24bf3c141c0f
 SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c:1.1
--- /dev/null   Tue Oct 25 18:46:08 2022
+++ pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c      Tue Oct 25 18:46:08 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-target_arm_translate-sve.c,v 1.1 2022/10/25 18:46:08 jperkin Exp $
+
+Avoid FSCALE define, notably on SunOS.
+
+--- target/arm/translate-sve.c.orig    2022-08-30 16:41:57.000000000 +0000
++++ target/arm/translate-sve.c
+@@ -3988,6 +3988,9 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve
+     };                                                          \
+     TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz, name##_zpzz_fns[a->esz], a)
+ 
++#ifdef FSCALE
++#undef FSCALE
++#endif
+ DO_ZPZZ_FP(FADD_zpzz, aa64_sve, sve_fadd)
+ DO_ZPZZ_FP(FSUB_zpzz, aa64_sve, sve_fsub)
+ DO_ZPZZ_FP(FMUL_zpzz, aa64_sve, sve_fmul)