frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)

This commit is contained in:
Daniel Stone 2006-06-03 10:48:37 +00:00
parent 5b703f847d
commit 8e8c6faecd
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-03 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
* hw/xfree86/os-support/bus/Pci.h:
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
2006-06-01 Adam Jackson <ajax@freedesktop.org> 2006-06-01 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Init.c: * hw/xfree86/common/xf86Init.c:

13
configure.ac
View File

@ -248,7 +248,10 @@ KDRIVE_HW=no
dnl it would be nice to autodetect these *CONS_SUPPORTs dnl it would be nice to autodetect these *CONS_SUPPORTs
case $host_os in case $host_os in
*freebsd*) *freebsd*)
AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) case $host_os in
kfreebsd*-gnu) ;;
*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;
esac
AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console]) AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
@ -1056,7 +1059,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
;; ;;
esac esac
;; ;;
freebsd*) freebsd* | kfreebsd*-gnu)
XORG_OS="freebsd" XORG_OS="freebsd"
XORG_OS_SUBDIR="bsd" XORG_OS_SUBDIR="bsd"
XORG_OS_KBD="BSD" XORG_OS_KBD="BSD"
@ -1156,7 +1159,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
;; ;;
powerpc*) powerpc*)
case $host_os in case $host_os in
linux*|freebsd*|netbsd*|openbsd*) linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
;; ;;
*) *)
xorg_bus_ppcpci="yes" xorg_bus_ppcpci="yes"
@ -1169,7 +1172,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
;; ;;
x86_64*|amd64*) x86_64*|amd64*)
case $host_os in case $host_os in
freebsd*) freebsd*|kfreebsd*-gnu)
# FreeBSD uses the system pci interface # FreeBSD uses the system pci interface
;; ;;
*) *)
@ -1509,7 +1512,7 @@ case $host_os in
cygwin*) ;; cygwin*) ;;
solaris*) ;; solaris*) ;;
darwin*) ;; darwin*) ;;
*bsd*) ;; freebsd*|netbsd*|openbsd*) ;;
*) *)
AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source]) AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source])
AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source]) AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source])

2
hw/xfree86/os-support/bus/Pci.h
View File

@ -332,7 +332,7 @@
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif # endif
#elif defined(__amd64__) || defined(__amd64) #elif defined(__amd64__) || defined(__amd64)
# if defined(__FreeBSD__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# define ARCH_PCI_INIT freebsdPciInit # define ARCH_PCI_INIT freebsdPciInit
# else # else
# define ARCH_PCI_INIT ix86PciInit # define ARCH_PCI_INIT ix86PciInit