xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xfree86/os-support/solaris/sun_vid.c |    7 +++++--
 hw/xfree86/os-support/xf86_OSlib.h      |   29 -----------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

New commits:
commit dee16edd2e1f0f7ba60117c4830e16112018308b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 18 14:26:45 2024 +0100

    xfree86: os-support: move _NEED_SYSI86 guarded block to sun_vid.c
    
    The sun_vid.c driver seems to be the only actual consumer left, so it
    can be dropped from public headers and moved to sun_vid.c instead.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1414>

diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index a546f1f53..fa7c2a82e 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -51,8 +51,11 @@
 #include <sys/types.h>          /* get __x86 definition if not set by compiler */
 
 #if defined(__i386__) || defined(__i386) || defined(__x86)
-#define _NEED_SYSI86
-#endif
+#include <sys/tss.h>
+#include <sys/sysi86.h>
+#include <sys/psw.h>
+#endif /* defined(__i386__) || defined(__i386) || defined(__x86) */
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 768789e8e..4896b9957 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -93,22 +93,6 @@
 
 #include <errno.h>
 
-#if defined(_NEED_SYSI86)
-#if !(defined (__sun) && defined (SVR4))
-#include <sys/immu.h>
-#include <sys/region.h>
-#include <sys/proc.h>
-#endif
-#include <sys/tss.h>
-#include <sys/sysi86.h>
-#if defined(SVR4) && !defined(__sun)
-#include <sys/seg.h>
-#endif                          /* SVR4 && !__sun */
-#if defined(__sun) && (defined (__i386__) || defined(__i386) || defined(__x86))  && defined (SVR4)
-#include <sys/psw.h>
-#endif
-#endif                          /* _NEED_SYSI86 */
-
 #if !defined(__sun) || defined(HAVE_SYS_VT_H)
 #define HAS_USL_VTS
 #endif
commit 1073ca2b8a442919a2922ac22d77a4ff54a23e30
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 25 11:29:05 2024 +0100

    xfree86: os-support: drop Solaris pre-7 remains
    
    Since meson transition, we can't build on Solaris older than v7
    (which came out 1998), so no need for extra quirks.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1414>

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 9d121546b..768789e8e 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -104,10 +104,6 @@
 #if defined(SVR4) && !defined(__sun)
 #include <sys/seg.h>
 #endif                          /* SVR4 && !__sun */
-/* V86SC_IOPL was moved to <sys/sysi86.h> on Solaris 7 and later */
-#if !defined(V86SC_IOPL)        /* Solaris 7 or later? */
-#include <sys/v86.h>            /* Nope */
-#endif
 #if defined(__sun) && (defined (__i386__) || defined(__i386) || defined(__x86))  && defined (SVR4)
 #include <sys/psw.h>
 #endif
commit bfcc7726a88934322b709fa322b5e2ae6392d594
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 25 10:34:30 2024 +0100

    xfree86: os-support: clean out remains of SVR3/sysv support
    
    SVR3/sysv support had been removed 13 years ago, but there still was
    some fallout left. The symbol HAS_SVR3_MMAPDRV never had been set by
    autoconf, let alone meson, so this piece of code is really dead.
    
    Fixes: 6ce1908ba4959aaa0a48171acb62cf6a5d5cbf18
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1414>

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index e15204cb4..9d121546b 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -113,15 +113,6 @@
 #endif
 #endif                          /* _NEED_SYSI86 */
 
-#if defined(HAS_SVR3_MMAPDRV)
-#include <sys/sysmacros.h>
-#if !defined(_NEED_SYSI86)
-#include <sys/immu.h>
-#include <sys/region.h>
-#endif
-#include <sys/mmap.h>           /* MMAP driver header */
-#endif
-
 #if !defined(__sun) || defined(HAVE_SYS_VT_H)
 #define HAS_USL_VTS
 #endif