CVS commit: pkgsrc/x11/modular-xorg-server

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 14 09:15:14 UTC 2024

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile
Added Files:
        pkgsrc/x11/modular-xorg-server: hacks.mk

Log Message:
x11/modular-xorg-server: Work around kern/58149 on NetBSD/aarch64 9.* and 10.0

See also
http://mail-index.netbsd.org/netbsd-users/2024/04/12/msg030915.html


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/modular-xorg-server/hacks.mk

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

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.141 pkgsrc/x11/modular-xorg-server/Makefile:1.142
--- pkgsrc/x11/modular-xorg-server/Makefile:1.141       Wed Dec 13 07:45:07 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile     Sun Apr 14 09:15:14 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2023/12/13 07:45:07 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2024/04/14 09:15:14 pho Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Added files:

Index: pkgsrc/x11/modular-xorg-server/hacks.mk
diff -u /dev/null pkgsrc/x11/modular-xorg-server/hacks.mk:1.1
--- /dev/null   Sun Apr 14 09:15:14 2024
+++ pkgsrc/x11/modular-xorg-server/hacks.mk     Sun Apr 14 09:15:14 2024
@@ -0,0 +1,26 @@
+# $NetBSD: hacks.mk,v 1.1 2024/04/14 09:15:14 pho Exp $
+
+.if !defined(MODULAR_XORG_SERVER_HACKS_MK)
+MODULAR_XORG_SERVER_HACKS_MK=  defined
+
+### [Tue Apr  9 13:40:46 JST 2024 : pho]
+###
+### With "smart scheduler" enabled, Xserver sets up an itimer to
+### periodically receive SIGALRM from the kernel while the server is doing
+### a socket I/O and processing commands from X clients. When the signal
+### arrives while Xserver is in pixman_composite_src_8888_8888_asm_neon()
+### or any similar functions from libpixman, the process fails to return
+### from the signal handler and exits with status code 22 (EINVAL) due to
+### kern/58149. These functions misalign SP while doing some SIMD stuff,
+### thereby trigger the kernel bug.
+###
+### Disabling itimer can avoid the problem but there might be a performance
+### regression.
+###
+.if ${MACHINE_PLATFORM:MNetBSD-9.*-aarch64} || \
+       ${MACHINE_PLATFORM:MNetBSD-10.0-aarch64}
+PKG_HACKS+=    smart-scheduler-workaround
+CONFIGURE_ENV+=        ac_cv_func_setitimer=no
+.endif
+
+.endif  # MODULAR_XORG_SERVER_HACKS_MK