Remove support for Solaris x86 releases older than Solaris 8
If you want to run a pre-1999 kernel, you'll need a pre-2009 X server [Some pre-Solaris 8 VT support is left by this patch to allow reuse by the new Solaris VT support that follows in the next patch.] Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM> Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
This commit is contained in:
parent
6c292d1705
commit
613e76ff90
15
configure.ac
15
configure.ac
|
@ -1443,9 +1443,7 @@ if test "x$XORG" = xyes; then
|
|||
# use libpciaccess for PCI
|
||||
xorg_bus_bsdpci="yes"
|
||||
AC_CHECK_HEADERS([sys/kd.h])
|
||||
# This really should be tests for specific features, but the #ifdef's
|
||||
# were done as a simple version check in XFree86 4.x and haven't been
|
||||
# fixed yet
|
||||
# Check for minimum supported release
|
||||
AC_MSG_CHECKING([Solaris version])
|
||||
OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e s'/\..*$//'`
|
||||
if test "${OS_MINOR}" -ge 7 ; then
|
||||
|
@ -1453,8 +1451,8 @@ if test "x$XORG" = xyes; then
|
|||
else
|
||||
AC_MSG_RESULT(Solaris `echo ${host_os}|sed -e 's/^.*solaris//`)
|
||||
fi
|
||||
if test "${OS_MINOR}" -ge 8 ; then
|
||||
AC_DEFINE(__SOL8__,1,[Solaris 8 or later])
|
||||
if test "${OS_MINOR}" -lt 8 ; then
|
||||
AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
|
||||
fi
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
|
@ -1472,11 +1470,7 @@ if test "x$XORG" = xyes; then
|
|||
else
|
||||
SOLARIS_INOUT_ARCH="ia32"
|
||||
fi
|
||||
if test "${OS_MINOR}" -lt 8 ; then
|
||||
solaris_usl_console="yes"
|
||||
else
|
||||
XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
|
||||
fi
|
||||
XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \
|
||||
|
@ -1608,7 +1602,6 @@ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
|
|||
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
|
||||
AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
|
||||
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
|
||||
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
|
||||
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
|
||||
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
|
||||
AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])
|
||||
|
|
|
@ -85,12 +85,6 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
* The first of many hacks to get VT switching to work under
|
||||
* Solaris 2.1 for x86. The basic problem is that Solaris is supposed
|
||||
* to be SVR4. It is for the most part, except where the video interface
|
||||
* is concerned. These hacks work around those problems.
|
||||
* See the comments for Linux, and SCO.
|
||||
*
|
||||
* This is a toggling variable:
|
||||
* FALSE = No VT switching keys have been pressed last time around
|
||||
* TRUE = Possible VT switch Pending
|
||||
|
@ -200,8 +194,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
|
|||
if (!xf86Info.dontZoom)
|
||||
xf86ZoomViewport(xf86Info.currentScreen, -1);
|
||||
break;
|
||||
#if !defined(__SOL8__) && \
|
||||
(!defined(sun) || defined(__i386__)) && defined(VT_ACTIVATE)
|
||||
#if defined(VT_ACTIVATE)
|
||||
case ACTION_SWITCHSCREEN:
|
||||
if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
|
||||
int vtno = *((int *) arg);
|
||||
|
@ -214,7 +207,6 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
|
|||
break;
|
||||
case ACTION_SWITCHSCREEN_NEXT:
|
||||
if (VTSwitchEnabled && !xf86Info.dontVTSwitch) {
|
||||
/* Shouldn't this be true for (sun) && (i386) && (SVR4) ? */
|
||||
#if defined(__SCO__) || defined(__UNIXWARE__)
|
||||
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
|
||||
#else
|
||||
|
|
|
@ -40,11 +40,7 @@ static int VTnum = -1;
|
|||
static int xf86StartVT = -1;
|
||||
#endif
|
||||
|
||||
#if defined(__SOL8__) || (!defined(__i386__) && !defined(__i386))
|
||||
static char fb_dev[PATH_MAX] = "/dev/fb";
|
||||
#else
|
||||
static char fb_dev[PATH_MAX] = "/dev/console";
|
||||
#endif
|
||||
|
||||
void
|
||||
xf86OpenConsole(void)
|
||||
|
|
|
@ -117,15 +117,9 @@
|
|||
# include <sys/seg.h>
|
||||
# endif /* SVR4 && !sun */
|
||||
/* V86SC_IOPL was moved to <sys/sysi86.h> on Solaris 7 and later */
|
||||
# if defined(sun) && defined (SVR4) /* Solaris? */
|
||||
# if defined(__i386__) || defined(__i386) || defined(__x86) /* on x86 or x64? */
|
||||
# if !defined(V86SC_IOPL) /* Solaris 7 or later? */
|
||||
# include <sys/v86.h> /* Nope */
|
||||
# endif
|
||||
# endif /* V86SC_IOPL */
|
||||
# else
|
||||
# include <sys/v86.h> /* Not solaris */
|
||||
# endif /* sun && i386 && SVR4 */
|
||||
# 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
|
||||
|
@ -140,7 +134,7 @@
|
|||
# include <sys/mmap.h> /* MMAP driver header */
|
||||
# endif
|
||||
|
||||
# if !defined(sun) || (!defined(sparc) && !defined(__SOL8__))
|
||||
# if !defined(sun)
|
||||
# define HAS_USL_VTS
|
||||
# endif
|
||||
# if !defined(sun)
|
||||
|
@ -198,7 +192,7 @@
|
|||
# endif /* SVR4 */
|
||||
|
||||
|
||||
# if defined(sun) && (defined (__i386__) || defined(__i386)) && defined (SVR4) && !defined(__SOL8__)
|
||||
# if defined(sun) && defined(HAS_USL_VTS)
|
||||
# define USE_VT_SYSREQ
|
||||
# define VT_SYSREQ_DEFAULT TRUE
|
||||
# endif
|
||||
|
|
|
@ -51,9 +51,6 @@
|
|||
/* Build DRI2 extension */
|
||||
#undef DRI2
|
||||
|
||||
/* Solaris 8 or later? */
|
||||
#undef __SOL8__
|
||||
|
||||
/* Define to 1 if you have the <stropts.h> header file. */
|
||||
#undef HAVE_STROPTS_H
|
||||
|
||||
|
|
|
@ -166,9 +166,6 @@
|
|||
/* System is BSD-like */
|
||||
#undef CSRG_BASED
|
||||
|
||||
/* Solaris 8 or later? */
|
||||
#undef __SOL8__
|
||||
|
||||
/* System has PC console */
|
||||
#undef PCCONS_SUPPORT
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user